diff --git a/.travis/get-toolchain.sh b/.travis/get-toolchain.sh
index 7f736aa23..361ecc5ee 100755
--- a/.travis/get-toolchain.sh
+++ b/.travis/get-toolchain.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-packages="https://people.phys.ethz.ch/~robertjo/artiq-dev/or1k-gcc_20141105-1_amd64.deb
-https://people.phys.ethz.ch/~robertjo/artiq-dev/or1k-binutils_20141105-1_amd64.deb
-http://us.archive.ubuntu.com/ubuntu/pool/universe/i/iverilog/iverilog_0.9.7-1_amd64.deb"
+packages="http://us.archive.ubuntu.com/ubuntu/pool/universe/i/iverilog/iverilog_0.9.7-1_amd64.deb"
+archives="http://fehu.whitequark.org/files/binutils-or1k.tbz2 http://fehu.whitequark.org/files/llvm-or1k.tbz2"
 
 mkdir -p packages
 
@@ -13,12 +12,18 @@ do
 	dpkg -x $pkg_name packages
 done
 
-export PATH=$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:$PATH
+for a in $archives
+do
+  wget $a
+  (cd packages && tar xvf ../$(basename $a))
+done
+
+export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:$PATH
 export LD_LIBRARY_PATH=$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:$LD_LIBRARY_PATH
 
-echo -e "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $HOME/.mlabs/build_settings.sh
+echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $HOME/.mlabs/build_settings.sh
+echo "export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PATH" >> $HOME/.mlabs/build_settings.sh
 
-or1k-elf-as --version
-or1k-elf-gcc --version
+or1k-linux-as --version
+llc --version
 clang --version
-llvm-as --version || true