diff --git a/create-image.sh b/create-image.sh
index c5bd97f7..ae97754f 100644
--- a/create-image.sh
+++ b/create-image.sh
@@ -5,7 +5,7 @@
 LOOP=$(sudo losetup -f)
 LOOPPART="${LOOP}p1"
 IMG=hd.img
-IMG_SIZE=2048MB
+IMG_SIZE=10GB
 BASE_SYS_ROOT=$(basename $SYS_ROOT)
 
 create_image () {
@@ -31,7 +31,7 @@ copy_files () {
    print_info "Copying system into mount..."
       mkdir -p mount/{etc,boot,dev,usr,hurd,servers,lib,libexec,proc,sbin,bin,var,root,tools} &&
       mkdir -p mount/var/{run,lib} &&
-      mkdir -p mount/servers/socket &&
+      mkdir -p mount/servers/{socket,bus} &&
       cp -R files/etc/* mount/etc/ &&
       mkdir -p mount/etc/hurd &&
       cp files/runsystem.hurd mount/libexec/ &&
diff --git a/files/SETUP b/files/SETUP
index 12e442b1..2fc10a30 100644
--- a/files/SETUP
+++ b/files/SETUP
@@ -27,11 +27,13 @@ fsysopts / --writable
 /bin/settrans -c /servers/socket/local /hurd/pflocal
 /bin/settrans -c /servers/crash /hurd/crash
 /bin/settrans -c /servers/password /hurd/password
+/bin/settrans -c /servers/acpi /hurd/acpi
+/bin/settrans -c /servers/bus/pci /hurd/pci-arbiter
 
 # Setup crucial devices
 cd /dev
 rm -f console
-/bin/bash /sbin/MAKEDEV console std hd0s1 tty1 tty2 tty3 tty4 tty5 tty6
+/bin/bash /sbin/MAKEDEV console std hd0 hd0s1 sd0 rumpdisk wd0 wd0s1 tty1 tty2 tty3 tty4 tty5 tty6
 set +v
 
 # if test "$BOOT_DEV" && /bin/sh ./MAKEDEV "$BOOT_DEV"; then
diff --git a/files/boot/grub.cfg b/files/boot/grub.cfg
index d75a256f..25db24f1 100644
--- a/files/boot/grub.cfg
+++ b/files/boot/grub.cfg
@@ -8,7 +8,9 @@ set timeout=1
 menuentry 'GNU' {
 	set root='hd0,msdos1'
 	echo	'Loading GNU Mach'
-	multiboot /boot/gnumach.gz root=device:hd0s1 -s
+	multiboot /boot/gnumach.gz root=part:1:device:wd0 noide
+	insmod part_msdos
+	insmod ext2
 	set root='hd0,msdos1'
 	echo 'Loading the Hurd ...'
 	module /hurd/pci-arbiter.static pci-arbiter \
@@ -16,8 +18,11 @@ menuentry 'GNU' {
 		--next-task='${acpi-task}' \
 		'$(pci-task=task-create)' '$(task-resume)'
 	module /hurd/acpi.static acpi \
-		--next-task='${fs-task}' \
+		--next-task='${disk-task}' \
 		'$(acpi-task=task-create)'
+	module /hurd/rumpdisk.static rumpdisk \
+		--next-task='${fs-task}' \
+		'$(disk-task=task-create)'
 	module /hurd/ext2fs.static ext2fs \
 		--multiboot-command-line='${kernel-command-line}' \
 		--exec-server-task='${exec-task}' -T typed '${root}' \
diff --git a/files/etc/fstab b/files/etc/fstab
index 1e3a1bb4..a1df8823 100644
--- a/files/etc/fstab
+++ b/files/etc/fstab
@@ -1 +1 @@
-/dev/hd0s1 / ext2 defaults 0 1
+/dev/wd0s1 / ext2 defaults 0 1
diff --git a/files/etc/mtab b/files/etc/mtab
index 1bb3ee55..4140ff7d 100644
--- a/files/etc/mtab
+++ b/files/etc/mtab
@@ -1,4 +1,4 @@
-/dev/hd0s1 / ext2fs writable,no-inherit-dir-group,store-type=typed 0 0
+/dev/wd0s1 / ext2fs writable,no-inherit-dir-group,store-type=typed 0 0
 none /run /hurd/tmpfs writable,no-suid,no-exec,no-inherit-dir-group,no-sync,size=187152K 0 0
 none /run/lock /hurd/tmpfs writable,no-suid,no-exec,no-inherit-dir-group,no-sync,size=5M 0 0
 none /run/shm /hurd/tmpfs writable,no-suid,no-exec,no-inherit-dir-group,no-sync,size=415520K 0 0