diff --git a/.travis.yml b/.travis.yml
index 6558b1ced12..19480c7d010 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ matrix:
            IMAGE=dist
            MAKE_TARGETS="test distcheck doc install uninstall"
            ALLOW_PR=1
+           NO_ADD=1
     - env: TARGET=i686-unknown-linux-gnu
            IMAGE=dist
            MAKE_TARGETS=test-unit-i686-unknown-linux-gnu
@@ -27,6 +28,7 @@ matrix:
            ALT=i686-apple-darwin
            MAKE_TARGETS="test distcheck doc install uninstall"
            MACOSX_DEPLOYMENT_TARGET=10.7
+           NO_ADD=1
       os: osx
     - env: TARGET=i686-apple-darwin
            MAKE_TARGETS=test-unit-i686-apple-darwin
@@ -61,22 +63,22 @@ matrix:
            IMAGE=cross
     - env: TARGET=mips64-unknown-linux-gnuabi64
            IMAGE=cross
-      rust: beta-2017-03-03
+      rust: beta
     - env: TARGET=mips64el-unknown-linux-gnuabi64
            IMAGE=cross
-      rust: beta-2017-03-03
+      rust: beta
     - env: TARGET=s390x-unknown-linux-gnu
            IMAGE=cross
-      rust: beta-2017-03-03
+      rust: beta
     - env: TARGET=powerpc-unknown-linux-gnu
            IMAGE=cross
-      rust: beta-2017-03-03
+      rust: beta
     - env: TARGET=powerpc64-unknown-linux-gnu
            IMAGE=cross
-      rust: beta-2017-03-03
+      rust: beta
     - env: TARGET=powerpc64le-unknown-linux-gnu
            IMAGE=cross
-      rust: beta-2017-03-03
+      rust: beta
 
     # beta/nightly builds
     - env: TARGET=x86_64-unknown-linux-gnu
@@ -84,24 +86,22 @@ matrix:
            IMAGE=dist
            MAKE_TARGETS="test distcheck doc install uninstall"
            DEPLOY=0
-      rust: beta-2017-03-03
+           NO_ADD=1
+      rust: beta
     - env: TARGET=x86_64-unknown-linux-gnu
            ALT=i686-unknown-linux-gnu
            IMAGE=dist
            MAKE_TARGETS="test distcheck doc install uninstall"
            DEPLOY=0
-      rust: nightly-2017-03-03
+           NO_ADD=1
+      rust: nightly
 
   exclude:
     - rust: stable
 
 before_script:
-  - curl https://static.rust-lang.org/rustup.sh |
-    sh -s -- --add-target=$TARGET --disable-sudo -y --prefix=`rustc --print sysroot`
-  - if [ ! -z "$ALT" ]; then
-      curl https://static.rust-lang.org/rustup.sh |
-      sh -s -- --add-target=$ALT --disable-sudo -y --prefix=`rustc --print sysroot`;
-    fi
+  - if [ -z "$NO_ADD" ]; then rustup target add $TARGET; fi
+  - if [ ! -z "$ALT" ]; then rustup target add $ALT; fi
 script:
   - >
       if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
diff --git a/Cargo.lock b/Cargo.lock
index 935da540a63..e2968a25077 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -37,7 +37,7 @@ dependencies = [
  "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -750,7 +750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "toml"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "serde 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -917,7 +917,7 @@ dependencies = [
 "checksum thread_local 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7793b722f0f77ce716e7f1acf416359ca32ff24d04ffbac4269f44a4a83be05d"
 "checksum time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "211b63c112206356ef1ff9b19355f43740fc3f85960c598a93d3a3d3ba7beade"
 "checksum toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4"
-"checksum toml 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08272367dd2e766db3fa38f068067d17aa6a9dfd7259af24b3927db92f1e0c2f"
+"checksum toml 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bd86ad9ebee246fdedd610e0f6d0587b754a3d81438db930a244d0480ed7878f"
 "checksum unicode-bidi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b61814f3e7fd0e0f15370f767c7c943e08bc2e3214233ae8f88522b334ceb778"
 "checksum unicode-normalization 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e28fa37426fceeb5cf8f41ee273faa7c82c47dc8fba5853402841e665fcd86ff"
 "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"