diff --git a/libguestfs.mkinitrd.boot.sh b/libguestfs.mkinitrd.boot.sh
index 8f1e031..2fac786 100644
--- a/libguestfs.mkinitrd.boot.sh
+++ b/libguestfs.mkinitrd.boot.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
 #%stage: block
 #
-#%modules: dm-mod
-#%modules: virtio_blk
-#%modules: virtio_console
-#%modules: virtio_net
-#%modules: virtio_pci
-#%modules: virtio_scsi
+#%modules: dm-mod virtio_blk virtio_console virtio_net virtio_pci virtio_scsi sg sd_mod sr_mod 
 #
 #%programs: mdadm
 #%programs: modprobe
@@ -15,22 +10,25 @@
 #%programs: ls
 #%programs: cat
 #%programs: ip
-#%programs: lsmod
 #%programs: date
+#%programs: valgrind
 #%programs: guestfsd
 #
+# Generated at build time:
 #@GUESTFS_EXT_CMDS@
 #
 missing_commands="@GUESTFS_MISSING_CMDS@"
 
+# Make the modules available now
+# run_all.sh will load them after this script is sourced
+load_modules
+
 # from libguestfs-1.19.34/appliance/init:
 
 # Scan for MDs.
 mdadm -As --auto=yes --run
 
 # Scan for LVM.
-modprobe dm_mod ||:
-
 lvm vgscan --ignorelockingfailure
 lvm vgchange -ay --ignorelockingfailure
 
@@ -46,7 +44,7 @@ if grep -sq guestfs_verbose=1 /proc/cmdline; then
     lvm lvs
     ip a
     ip r
-    lsmod
+    cat /proc/modules
     #hwclock -r
     date
     #ping -n -v -c 5 10.0.2.2
diff --git a/libguestfs.mkinitrd.setup.sh b/libguestfs.mkinitrd.setup.sh
index ed5856b..bf5bfbc 100644
--- a/libguestfs.mkinitrd.setup.sh
+++ b/libguestfs.mkinitrd.setup.sh
@@ -1,3 +1,13 @@
 #!/bin/bash
 #%stage: block
 #
+
+for f in /etc/magic /usr/share/misc/magic*
+do
+	if test -e $f
+	then
+		mkdir -vp $tmp_mnt/${f%/*}
+		cp -av $f $tmp_mnt/$f
+	fi
+done
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 1e2fc00..e503ea5 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -73,6 +73,7 @@ BuildRequires:  ntfs-3g
 BuildRequires:  rsync
 BuildRequires:  cryptsetup
 BuildRequires:  iproute2
+BuildRequires:  strace
 %if %suse_version < 1210
 # perl as included in openSuSE 11.4 has this, but an older version without html_charset
 # Without the version the requires is ignored for some reason
@@ -357,7 +358,9 @@ rm -rf mkinitrd
 cp -av /lib/mkinitrd .
 for bad in \
 	setup-dm.sh \
-	setup-storage.sh
+	setup-storage.sh \
+	boot-storage.sh \
+	;
 do
 	rm mkinitrd/scripts/${bad}
 done