diff --git a/ci/env.sh b/ci/env.sh
index 9addf55..feeac22 100644
--- a/ci/env.sh
+++ b/ci/env.sh
@@ -40,6 +40,8 @@ if [[ $TARGET != $HOST && ! $TARGET =~ ^i.86- ]]; then
             ;;
     esac
 
+    export CARGO_TARGET_$(echo $TARGET | tr a-z- A-Z_)_LINKER=$GCC_TRIPLE-gcc
+
     if [[ $RUN_TESTS == y ]]; then
         # NOTE(export) so this can reach the processes that `cargo test` spawns
         export QEMU_LD_PREFIX=/usr/$GCC_TRIPLE
diff --git a/ci/install.sh b/ci/install.sh
index 45ad243..86095e3 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -11,7 +11,9 @@ install_qemu() {
 }
 
 install_gist() {
-    gem install gist -v 4.5.0
+    if [[ $OSX ]]; then
+        gem install gist -v 4.5.0
+    fi
 }
 
 install_binutils() {
@@ -38,13 +40,6 @@ add_rustup_target() {
     fi
 }
 
-install_xargo() {
-    if [[ $CARGO == xargo ]]; then
-        curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
-            bash -s -- --from japaric/xargo --at /root/.cargo/bin --vers 0.1.5
-    fi
-}
-
 main() {
     if [[ $OSX || ${IN_DOCKER_CONTAINER:-n} == y ]]; then
         install_qemu
@@ -52,7 +47,6 @@ main() {
         install_binutils
         install_rust
         add_rustup_target
-        install_xargo
     fi
 }
 
diff --git a/ci/script.sh b/ci/script.sh
index 20e5741..38c6b32 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -42,8 +42,7 @@ run_tests() {
 
 main() {
     if [[ $LINUX && ${IN_DOCKER_CONTAINER:-n} == n ]]; then
-        local tag=2016-08-24
-
+        # NOTE The Dockerfile of this image is in the docker branch of this repository
         docker run \
                --privileged \
                -e IN_DOCKER_CONTAINER=y \
@@ -52,7 +51,7 @@ main() {
                -e TRAVIS_COMMIT=$TRAVIS_COMMIT \
                -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
                -v $(pwd):/mnt \
-               japaric/rustc-builtins:$tag \
+               japaric/rustc-builtins \
                sh -c 'cd /mnt;
                       bash ci/install.sh;
                       bash ci/script.sh'