diff --git a/build.sh b/build.sh
index 3acf9282..25fee7dd 100755
--- a/build.sh
+++ b/build.sh
@@ -30,7 +30,7 @@ if [ "$TASK"x = ""x ] ; then
 			unset COMPLETE
 			;;
 		"2"x)
-			TASK=tasks/debian-installer+kernel-$DI_CODENAME
+			TASK=tasks/debian-installer+kernel-$CODENAME
 			unset COMPLETE
 			;;
 		*)
diff --git a/debian/changelog b/debian/changelog
index 8905898d..3b08f79b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,8 +68,11 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
   * Support including packages from proposed-updates.
     This can be useful for pre-release testing of point releases, but should
     be used with care when CDs are intended to be published.
+  * build.sh: after the earlier change in generate_di+k_list in this release,
+    this script should also use the debian-installer+kernel task for the
+    requested codename, and not the used D-I release.
 
- -- Frans Pop <fjp@debian.org>  Sun, 13 Jul 2008 13:42:02 +0200
+ -- Frans Pop <fjp@debian.org>  Fri, 18 Jul 2008 17:11:40 +0200
 
 debian-cd (3.0.4) unstable; urgency=low