diff --git a/.travis.yml b/.travis.yml
index 0ee6779f4..24a91b203 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,15 @@ before_install:
         - sudo apt-get install -y nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev
         - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
         - git submodule update --init --recursive
-before_script:
-        - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-        - export PATH=$PATH:/usr/local/bin
+script:
+        - ./configure
+        - wget https://www.lankes.org/deploy/bzImage
+        - mv bzImage linux/arch/x86/boot/
+        - wget https://www.lankes.org/deploy/bootstrap.tar.gz
+        - tar xzf bootstrap.tar.gz
+        - mv tmp hermit/usr/
+        - mv x86 hermit/usr/
+        - make
+env:
+        global:
+                - TOPDIR=`pwd`/../..
diff --git a/hermit/usr/binutils b/hermit/usr/binutils
index e01434f98..d3607ae1f 160000
--- a/hermit/usr/binutils
+++ b/hermit/usr/binutils
@@ -1 +1 @@
-Subproject commit e01434f988504084dafad03b66436987e051ec65
+Subproject commit d3607ae1ff7a21163d23c2f6f95f4b2b08e211d3
diff --git a/hermit/usr/gcc b/hermit/usr/gcc
index 35ac1cbf3..493275551 160000
--- a/hermit/usr/gcc
+++ b/hermit/usr/gcc
@@ -1 +1 @@
-Subproject commit 35ac1cbf3b27f9ce2d077b2ecba706f7e8a3f479
+Subproject commit 493275551b8e71dec0cff0ce4422320cc0eda4b6