diff --git a/debian/changelog b/debian/changelog
index 919ba1fd..543aa732 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,7 +67,6 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
     - Preprocess exclude files much like tasks files are. Closes: #247379
     - Check if the missing debootstrap-required is not included on
       base_exclude.
-    - Use DI_CODENAME variable to build debian-installer+kernel task.
 
  -- Raphael Hertzog <hertzog@debian.org>  Thu, 25 Mar 2004 07:33:23 +0100
 
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index a1e73e5b..1d907d2c 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -2,7 +2,7 @@
 
 # Generate a list of packages required for debian-installer
 # This script makes use of the following variables that need to be preset:
-# MIRROR, DI_CODENAME
+# MIRROR, CODENAME
 
 DATE=`date`
 cat > debian-installer+kernel << EOF
@@ -39,13 +39,13 @@ lilo
 EOF
 
 /bin/sed -n 's/Package: \(kernel-image-2.4.*-386\)$/\1/p' \
-  $MIRROR/dists/$DI_CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
+  $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
   >> debian-installer+kernel
 /bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.4.*-386\)$/\1/p' \
-  $MIRROR/dists/$DI_CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
+  $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
   >> debian-installer+kernel
 /bin/sed -n 's/Package: \(kernel-image-2.6.*-386\)$/\1/p' \
-  $MIRROR/dists/$DI_CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
+  $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
   >> debian-installer+kernel
 
 cat >> debian-installer+kernel << EOF
@@ -55,7 +55,7 @@ discover1
 EOF
 
 /bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \
-  $MIRROR/dists/$DI_CODENAME/main/binary-alpha/Packages|grep -v 2.4.21 \
+  $MIRROR/dists/$CODENAME/main/binary-alpha/Packages|grep -v 2.4.21 \
   >> debian-installer+kernel
 
 cat >> debian-installer+kernel << EOF
@@ -65,7 +65,7 @@ discover1
 EOF
 
 /bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \
-  $MIRROR/dists/$DI_CODENAME/main/binary-hppa/Packages|tail -n4 \
+  $MIRROR/dists/$CODENAME/main/binary-hppa/Packages|tail -n4 \
   >> debian-installer+kernel
 
 cat >> debian-installer+kernel << EOF
@@ -76,7 +76,7 @@ initrd-tools
 EOF
 
 /bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \
-  $MIRROR/dists/$DI_CODENAME/main/binary-ia64/Packages | grep 2.4 | tail -n 4 \
+  $MIRROR/dists/$CODENAME/main/binary-ia64/Packages | grep 2.4 | tail -n 4 \
   >> debian-installer+kernel
 
 cat >> debian-installer+kernel << EOF
@@ -88,7 +88,7 @@ EOF
 # Only include mips kernels that d-i base-installer installs.
 for subarch in r4k-ip22 r5k-ip22; do
 	sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
-		$MIRROR/dists/$DI_CODENAME/main/binary-mips/Packages \
+		$MIRROR/dists/$CODENAME/main/binary-mips/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
                 >> debian-installer+kernel
 done
@@ -101,7 +101,7 @@ EOF
 # Only include mipsel kernels that d-i base-installer installs.
 for subarch in r3k-kn02 r4k-kn04; do
 	sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
-		$MIRROR/dists/$DI_CODENAME/main/binary-mipsel/Packages \
+		$MIRROR/dists/$CODENAME/main/binary-mipsel/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
                 >> debian-installer+kernel
 done
@@ -116,7 +116,7 @@ EOF
 for subarch in powerpc-pmac powerpc-small-pmac powerpc-prep powerpc-chrp \
                powerpc-chrp-rs6k apus; do
 	sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
-		$MIRROR/dists/$DI_CODENAME/main/binary-powerpc/Packages \
+		$MIRROR/dists/$CODENAME/main/binary-powerpc/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
                 >> debian-installer+kernel
 done
@@ -128,7 +128,7 @@ discover1
 EOF
 
 /bin/sed -n 's/Package: \(kernel-image-.*-sparc.*\)$/\1/p' \
-  $MIRROR/dists/$DI_CODENAME/main/binary-sparc/Packages \
+  $MIRROR/dists/$CODENAME/main/binary-sparc/Packages \
   >> debian-installer+kernel
 
 cat >> debian-installer+kernel << EOF
@@ -138,11 +138,11 @@ EOF
 
 # Get all the 2.2 kernels
 /bin/sed -n 's/Package: \(kernel-image-2.2.*\)$/\1/p' \
-  $MIRROR/dists/$DI_CODENAME/main/binary-m68k/Packages | tail -n 6 \
+  $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 6 \
   >> debian-installer+kernel
 # Get the latest 2.4 kernel for amiga
 /bin/sed -n 's/Package: \(kernel-image-2.4.*-amiga\)$/\1/p' \
-  $MIRROR/dists/$DI_CODENAME/main/binary-m68k/Packages | tail -n 1 \
+  $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \
   >> debian-installer+kernel
 
 cat >> debian-installer+kernel << EOF