diff --git a/compile.sh b/compile.sh
index 8fc6ef88..36d2dcce 100644
--- a/compile.sh
+++ b/compile.sh
@@ -142,6 +142,7 @@ install_hurd() {
       --prefix=$SYS_ROOT \
       --without-parted \
       --with-libgcrypt-prefix=$SYS_ROOT \
+      --enable-static-progs='ext2fs,iso9660fs,rumpdisk,pci-arbiter,acpi' \
       --disable-profile &&
    make -j$PROCS all &&
    fakeroot make -j$PROCS install &&
diff --git a/download-funcs.sh b/download-funcs.sh
index 9c2c7fb1..b861c159 100644
--- a/download-funcs.sh
+++ b/download-funcs.sh
@@ -98,6 +98,9 @@ download_mig () {
 
 download_hurd () {
    download_from_git hurd git://git.savannah.gnu.org/hurd/hurd.git
+   pushd hurd &&
+   apply_patch $SCRIPT_DIR/patches/hurd/link-rump.patch 1
+   popd
 }
 
 download_rumpkernel () {
@@ -110,7 +113,9 @@ download_libacpica () {
 
 apply_patch() {
    print_info "Using patch $1 (level: $2)"
-   patch -Np$2 < $1 || exit 1
+   if patch -f -Np$2 --dry-run < $1 > /dev/null 2>&1; then
+    patch -Np$2 < $1 || exit 1
+   fi
 }
 
 download_glibc () {
diff --git a/patches/hurd/link-rump.patch b/patches/hurd/link-rump.patch
new file mode 100644
index 00000000..7375edfb
--- /dev/null
+++ b/patches/hurd/link-rump.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index dd2481b0..6e754a7a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -239,7 +239,7 @@ AS_IF([test "x$with_rump" != xno], [
+   # Save
+   oldLIBS="$LIBS"
+ 
+-  LIBS="$oldLIBS -lrump"
++  LIBS="$oldLIBS -lrump -lrumpuser -lrumpvfs -lrumpvfs_fifofs  -lrumpnet -lrumpnet_net -lrumpnet_local"
+   AC_LINK_IFELSE(
+     [AC_LANG_PROGRAM(
+       [[#include <hurd.h>