diff --git a/squeeze/debian/changelog b/squeeze/debian/changelog
index 2045dcd3..6cdb8d66 100644
--- a/squeeze/debian/changelog
+++ b/squeeze/debian/changelog
@@ -50,6 +50,9 @@ debian-cd (3.1.6) UNRELEASED-backport; urgency=low
     + Pick up on a potential bug: if we finish the last (expected) disc with
       a backed-out file, make sure we create another image to include that
       file too.
+  * Add an extra tweaked version of d390.ins for s390 booting. The
+    Hardware Management Console needs the file to be in the root
+    directory.
 
  -- Raphaël Hertzog <hertzog@debian.org>  Fri, 04 Feb 2011 09:59:21 +0100
 
diff --git a/squeeze/tools/boot/squeeze/boot-s390 b/squeeze/tools/boot/squeeze/boot-s390
index 34b8351d..15f3172d 100755
--- a/squeeze/tools/boot/squeeze/boot-s390
+++ b/squeeze/tools/boot/squeeze/boot-s390
@@ -86,6 +86,7 @@ done
 # - d390.tdf    : for booting from emulated tape
 # - d390oco.tdf : same, using object-code-only-modules-ramdisk (example)
 cp $BASEDIR/data/$CODENAME/s390/d390* "$imagedir/"
+sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/s390/d390.ins > "boot$N/d390.ins"
 
 # Create the files specifying offset and size of the initrd
 perl -e "print pack('N', 0x800000)" >"$imagedir/root.off"