diff --git a/.travis.yml b/.travis.yml
index 5ff3a1c13f0d1..c87f5e243224d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: shell
 sudo: required
 dist: trusty
+group: deprecated-2017Q4
 services:
   - docker
 
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index 9186699a3b583..3c12cfc4c7ffd 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -159,7 +159,7 @@ impl Step for CargoBook {
 
         let target = self.target;
         let name = self.name;
-        let src = PathBuf::from("src/tools/cargo/src/doc/book");
+        let src = build.src.join("src/tools/cargo/src/doc/book");
 
         let out = build.doc_out(target);
         t!(fs::create_dir_all(&out));
diff --git a/src/ci/docker/scripts/crosstool-ng.sh b/src/ci/docker/scripts/crosstool-ng.sh
index 79a5bc3bb4ac6..4cd25ffa277a4 100644
--- a/src/ci/docker/scripts/crosstool-ng.sh
+++ b/src/ci/docker/scripts/crosstool-ng.sh
@@ -10,11 +10,12 @@
 
 set -ex
 
-url="http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2"
-curl -f $url | tar xjf -
-cd crosstool-ng
+url="https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-1.22.0.tar.gz"
+curl -Lf $url | tar xzf -
+cd crosstool-ng-crosstool-ng-1.22.0
+./bootstrap
 ./configure --prefix=/usr/local
 make -j$(nproc)
 make install
 cd ..
-rm -rf crosstool-ng
+rm -rf crosstool-ng-crosstool-ng-1.22.0