diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index cf0f8645..116fb14a 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -2,10 +2,10 @@
 
 # Generate a list of packages required for debian-installer
 # This script makes use of the following variables that need to be preset:
-# MIRROR, CODENAME
+# MIRROR, CODENAME, DI_CODENAME
 
 DATE=`date`
-cat > debian-installer+kernel-$CODENAME << EOF
+cat > debian-installer+kernel-$DI_CODENAME << EOF
 /* These files + the ones needed by debootstrap are the ones needed for
  * debian-installer to be able to complete the installation of the base
  * system.
@@ -18,7 +18,7 @@ cat > debian-installer+kernel-$CODENAME << EOF
  * Last update: $DATE
  */
 
-#include <debian-installer-$CODENAME>
+#include <debian-installer-$DI_CODENAME>
 eject
 locales
 lvm10
@@ -50,15 +50,15 @@ EOF
 
 /bin/sed -n 's/Package: \(kernel-image-2.4.*-386\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 /bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.4.*-386\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 /bin/sed -n 's/Package: \(kernel-image-2.6.*-386\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 
-cat >> debian-installer+kernel-$CODENAME << EOF
+cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 #ifdef ARCH_amd64
 discover
@@ -69,17 +69,17 @@ EOF
 
 if [ ! -e $MIRROR/dists/$CODENAME/main/binary-amd64/Packages ]; then
 	echo "Cannot find amd64 packages file, inserting static entry as workaround" >&2
-	echo kernel-image-2.6.8-11-amd64-generic >> debian-installer+kernel-$CODENAME
+	echo kernel-image-2.6.8-11-amd64-generic >> debian-installer+kernel-$DI_CODENAME
 else
 	/bin/sed -n 's/Package: \(kernel-image-2.6.*-generic\)$/\1/p' \
 	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
-	  >> debian-installer+kernel-$CODENAME
+	  >> debian-installer+kernel-$DI_CODENAME
 	/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.6.*-generic\)$/\1/p' \
 	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
-	  >> debian-installer+kernel-$CODENAME
+	  >> debian-installer+kernel-$DI_CODENAME
 fi
 	 
-cat >> debian-installer+kernel-$CODENAME << EOF
+cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 #ifdef ARCH_alpha
 aboot
@@ -89,9 +89,9 @@ EOF
 
 /bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-alpha/Packages|grep -v 2.4.21 \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 
-cat >> debian-installer+kernel-$CODENAME << EOF
+cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 #ifdef ARCH_hppa
 discover1
@@ -99,9 +99,9 @@ EOF
 
 /bin/sed -n 's/Package: \(kernel-image-2.6.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-hppa/Packages|tail -n4 \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 
-cat >> debian-installer+kernel-$CODENAME << EOF
+cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 #ifdef ARCH_ia64
 discover1
@@ -110,18 +110,18 @@ EOF
 
 /bin/sed -n 's/Package: \(kernel-image-2\.4\..*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 /bin/sed -n 's/Package: \(kernel-image-2\.4-.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 /bin/sed -n 's/Package: \(kernel-image-2\.6\..*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 /bin/sed -n 's/Package: \(kernel-image-2\.6-.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 
-cat >> debian-installer+kernel-$CODENAME << EOF
+cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 #ifdef ARCH_mips
 arcboot
@@ -132,10 +132,10 @@ for subarch in r4k-ip22 r5k-ip22; do
 	sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
 		$MIRROR/dists/$CODENAME/main/binary-mips/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
-                >> debian-installer+kernel-$CODENAME
+                >> debian-installer+kernel-$DI_CODENAME
 done
 
-cat >> debian-installer+kernel-$CODENAME << EOF
+cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 #ifdef ARCH_mipsel
 delo
@@ -146,10 +146,10 @@ for subarch in r3k-kn02 r4k-kn04; do
 	sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
 		$MIRROR/dists/$CODENAME/main/binary-mipsel/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
-                >> debian-installer+kernel-$CODENAME
+                >> debian-installer+kernel-$DI_CODENAME
 done
 
-cat >> debian-installer+kernel-$CODENAME << EOF
+cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 #ifdef ARCH_powerpc
 discover1
@@ -167,10 +167,10 @@ for subarch in powerpc power3 power4 power3-pmac power3-chrp-rs6k \
 	sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
 		$MIRROR/dists/$CODENAME/main/binary-powerpc/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
-                >> debian-installer+kernel-$CODENAME
+                >> debian-installer+kernel-$DI_CODENAME
 done
 
-cat >> debian-installer+kernel-$CODENAME << EOF
+cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 #ifdef ARCH_sparc
 discover1
@@ -179,32 +179,24 @@ EOF
 
 /bin/sed -n 's/Package: \(kernel-image-.*-sparc.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-sparc/Packages \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 
-cat >> debian-installer+kernel-$CODENAME << EOF
+cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 #ifdef ARCH_m68k
 fileutils
 EOF
 
-# Get all the 2.2 kernels
-#/bin/sed -n 's/Package: \(kernel-image-2.2.*\)$/\1/p' \
-#  $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 6 \
-#  >> debian-installer+kernel-$CODENAME
-# Get the latest 2.4 kernel for amiga
-#/bin/sed -n 's/Package: \(kernel-image-2.4.*-amiga\)$/\1/p' \
-#  $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \
-#  >> debian-installer+kernel-$CODENAME
 # Get all the latest 2.2 for mac kernel
 /bin/sed -n 's/Package: \(kernel-image-2.2.*-mac\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 # Get the latest 2.4 kernels, except mac
 /bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 7 | \
-  grep -v mac >> debian-installer+kernel-$CODENAME
+  grep -v mac >> debian-installer+kernel-$DI_CODENAME
 
-cat >> debian-installer+kernel-$CODENAME << EOF
+cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 #ifdef ARCH_arm
 discover1
@@ -212,8 +204,8 @@ EOF
 
 /bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-arm/Packages|tail -n5 \
-  >> debian-installer+kernel-$CODENAME
+  >> debian-installer+kernel-$DI_CODENAME
 
-cat >> debian-installer+kernel-$CODENAME << EOF
+cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 EOF