diff --git a/debian/changelog b/debian/changelog
index 7a58ba70..cd2cfcd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -99,13 +99,16 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
   * Update task-essential-etch.
   * Update task.list to include all the new language tasks.
   * Update task-full-etch.
-  
+
   [ Steve McIntyre ]
   * Mips has dropped r5k-ip22 kernels and gained r5k-ip32. And r5k-ip32
     doesn't have CD boot support yet, so don't attempt to use the cdrom
     boot image.
 
- -- Frans Pop <fjp@debian.org>  Fri, 28 Jul 2006 23:17:44 +0200
+  [ Frans Pop ]
+  * There are no "tape" images with 2.6.16 for S/390.
+
+ -- Frans Pop <fjp@debian.org>  Sat, 29 Jul 2006 21:09:45 +0200
 
 debian-cd (2.2.24) unstable; urgency=low
 
diff --git a/tools/boot/etch/boot-s390 b/tools/boot/etch/boot-s390
index f52ba9f2..2346a7a8 100755
--- a/tools/boot/etch/boot-s390
+++ b/tools/boot/etch/boot-s390
@@ -51,7 +51,9 @@ mkdir -p $imagedir
 # - tape/kernel.debian         : kernel for tape
 # - tape/kernel.debian-nolabel : kernel for tape (nolabel)
 
-images_S390="generic/parmfile.debian generic/initrd.debian generic/kernel.debian tape/kernel.debian tape/kernel.debian-nolabel"
+# Tape images not available with 2.6.16
+#images_S390="generic/parmfile.debian generic/initrd.debian generic/kernel.debian tape/kernel.debian tape/kernel.debian-nolabel"
+images_S390="generic/parmfile.debian generic/initrd.debian generic/kernel.debian"
 
 for image in $images_S390; do
 	case $image in
@@ -85,14 +87,10 @@ done
 # - d390oco.ins : same, using object-code-only-modules-ramdisk (example)
 # - d390.tdf    : for booting from emulated tape
 # - d390oco.tdf : same, using object-code-only-modules-ramdisk (example)
-
 cp $BASEDIR/data/$CODENAME/s390/d390* "$imagedir/"
 
 # Copy the README file
-
 cp $BASEDIR/data/$CODENAME/s390/README.boot "boot$N/"
 
-
 # Include the boot$N/-tree into the iso-image
-
 echo -n "-J boot$N "  >> $N.mkisofs_opts