diff --git a/.travis.yml b/.travis.yml
index 6e15445..3315104 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,31 @@
 # Sample .travis.yml for R projects from https://github.com/craigcitro/r-travis
 
 language: c
+sudo: required
 
 before_install:
-  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
-  - chmod 755 ./travis-tool.sh
-  - ./travis-tool.sh bootstrap
+  - curl -OL https://raw.githubusercontent.com/metacran/r-builder/master/pkg-build.sh
+  - chmod 755 pkg-build.sh
+  - ./pkg-build.sh bootstrap
 
 install:
-  - ./travis-tool.sh install_deps
+  - ./pkg-build.sh install_deps
 
-script: ./travis-tool.sh run_tests
+script:
+  - ./pkg-build.sh run_tests
 
 after_failure:
-  - ./travis-tool.sh dump_logs
+  - ./pkg-build.sh dump_logs
 
 notifications:
   email:
     on_success: change
-    on_failure: change
+    on_failure: always
+
+env:
+  matrix:
+    - RVERSION=oldrel
+    - RVERSION=release
+    - RVERSION=devel
+  global:
+    - NOT_CRAN=1