diff --git a/CONF.sh b/CONF.sh
index 2236d894..bf39332e 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -266,8 +266,8 @@ export PUBLISH_PATH="/home/jigdo-area/"
 
 # Only put the installer onto the cd (set NORECOMMENDS,... as well).
 # INSTALLER_CD=0: nothing special (default)
-# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer)
-# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel)
+# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer-$CODENAME)
+# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel-$CODENAME)
 #export INSTALLER_CD=0
 
 # Parameters to pass to kernel when the CD boots. Not currently supported
diff --git a/debian/CONF.sh b/debian/CONF.sh
index 3b48b9f2..fb9683ee 100644
--- a/debian/CONF.sh
+++ b/debian/CONF.sh
@@ -265,8 +265,8 @@ export PUBLISH_PATH="/home/jigdo-area/"
 
 # Only put the installer onto the cd (set NORECOMMENDS,... as well).
 # INSTALLER_CD=0: nothing special (default)
-# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer)
-# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel)
+# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer-$CODENAME)
+# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel-$CODENAME)
 #export INSTALLER_CD=0
 
 # Parameters to pass to kernel when the CD boots. Not currently supported
diff --git a/debian/changelog b/debian/changelog
index f123c946..338c2ec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ debian-cd (2.2.22) UNRELEASED; urgency=low
     - Add support for f4.txt that is for systems with the 2.6 kernel.
     - Exclude new mouse-modules udebs from CDs until something in d-i uses
       them.
+    - debian-installer task files renamed to include distro name and branched
+      for etch.
   * Steve McIntyre
     - Make woody's post-boot-mipsel script cope with extra fields in the
       output of sarge's isoinfo
@@ -18,7 +20,7 @@ debian-cd (2.2.22) UNRELEASED; urgency=low
     - Don't copy the whole d-i cdrom directory onto CD1 for amd64.
       Closes: #306926
     - Don't copy boot.img.gz onto amd64 CD1.
-	
+
  -- Joey Hess <joeyh@debian.org>  Thu, 14 Apr 2005 00:59:49 -0400
 
 debian-cd (2.2.21) unstable; urgency=low
diff --git a/tasks/Debian_etch b/tasks/Debian_etch
index 30cae374..5e42a413 100644
--- a/tasks/Debian_etch
+++ b/tasks/Debian_etch
@@ -9,7 +9,7 @@
 #endif
 
 /* Packages that should really be on CD1 */
-#include <debian-installer+kernel>
+#include <debian-installer+kernel-etch>
 #include <base-etch>
 #include <forcd1>
 #include <task-essential-etch>
diff --git a/tasks/Debian_sarge b/tasks/Debian_sarge
index 8cab52e0..6c526181 100644
--- a/tasks/Debian_sarge
+++ b/tasks/Debian_sarge
@@ -9,7 +9,7 @@
 #endif
 
 /* Packages that should really be on CD1 */
-#include <debian-installer+kernel>
+#include <debian-installer+kernel-sarge>
 #include <base-sarge>
 #include <forcd1>
 #include <task-essential-sarge>
diff --git a/tasks/debian-installer+kernel b/tasks/debian-installer+kernel-etch
similarity index 98%
rename from tasks/debian-installer+kernel
rename to tasks/debian-installer+kernel-etch
index 10bcae15..f494088f 100644
--- a/tasks/debian-installer+kernel
+++ b/tasks/debian-installer+kernel-etch
@@ -10,7 +10,7 @@
  * Last update: Sun Feb 20 16:43:53 MST 2005
  */
 
-#include <debian-installer>
+#include <debian-installer-etch>
 eject
 locales
 lvm10
diff --git a/tasks/debian-installer+kernel-sarge b/tasks/debian-installer+kernel-sarge
new file mode 100644
index 00000000..e0fd9519
--- /dev/null
+++ b/tasks/debian-installer+kernel-sarge
@@ -0,0 +1,154 @@
+/* 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.
+ *
+ * This list can be generated with the command:
+ * ../tools/generate_di+k_list
+ *
+ * DO NOT EDIT THIS FILE, edit the above script
+ *
+ * Last update: Sun Feb 20 16:43:53 MST 2005
+ */
+
+#include <debian-installer-sarge>
+eject
+locales
+lvm10
+libdevmapper1.01
+lvm-common
+lvm2
+mdadm
+aptitude
+jfbterm
+unifont
+hotplug
+usbutils
+iso-codes
+console-cyrillic
+console-terminus
+pcmcia-cs
+wireless-tools
+xfsprogs
+jfsutils
+reiserfsprogs
+libfribidi0
+localization-config
+#ifdef ARCH_i386
+discover
+discover1
+grub
+lilo
+kernel-image-2.4.27-2-386
+kernel-pcmcia-modules-2.4.27-2-386
+kernel-image-2.6.8-2-386
+#endif
+#ifdef ARCH_amd64
+kernel-image-2.6.8-9-amd64-generic
+#endif
+#ifdef ARCH_alpha
+aboot
+aboot-base
+discover1
+kernel-image-2.4-generic
+kernel-image-2.4-smp
+kernel-image-2.4.27-2-generic
+kernel-image-2.4.27-2-smp
+kernel-image-2.6-generic
+kernel-image-2.6-smp
+kernel-image-2.6.8-2-generic
+kernel-image-2.6.8-2-smp
+kernel-image-netbootable
+#endif
+#ifdef ARCH_hppa
+discover1
+kernel-image-2.6.8-2-32
+kernel-image-2.6.8-2-32-smp
+kernel-image-2.6.8-2-64
+kernel-image-2.6.8-2-64-smp
+#endif
+#ifdef ARCH_ia64
+discover1
+initrd-tools
+kernel-image-2.4.27-2-itanium
+kernel-image-2.4.27-2-itanium-smp
+kernel-image-2.4.27-2-mckinley
+kernel-image-2.4.27-2-mckinley-smp
+kernel-image-2.4-itanium
+kernel-image-2.4-itanium-smp
+kernel-image-2.4-mckinley
+kernel-image-2.4-mckinley-smp
+kernel-image-2.6.8-2-itanium
+kernel-image-2.6.8-2-itanium-smp
+kernel-image-2.6.8-2-mckinley
+kernel-image-2.6.8-2-mckinley-smp
+kernel-image-2.6-itanium
+kernel-image-2.6-itanium-smp
+kernel-image-2.6-mckinley
+kernel-image-2.6-mckinley-smp
+#endif
+#ifdef ARCH_mips
+arcboot
+kernel-image-2.4.27-r4k-ip22
+kernel-image-2.4.27-r5k-ip22
+#endif
+#ifdef ARCH_mipsel
+delo
+kernel-image-2.4.27-r3k-kn02
+kernel-image-2.4.27-r4k-kn04
+#endif
+#ifdef ARCH_powerpc
+discover1
+quik
+yaboot
+mkvmlinuz
+module-init-tools
+initrd-tools
+kernel-image-2.6.8-powerpc
+kernel-image-2.6.8-power3
+kernel-image-2.6.8-power4
+kernel-image-2.4.27-power3-pmac
+kernel-image-2.4.27-power3-chrp-rs6k
+kernel-image-2.4.27-power4-pmac
+kernel-image-2.4.27-power4-chrp-rs6k
+kernel-image-2.4.27-powerpc-pmac
+kernel-image-2.4.27-powerpc-prep
+kernel-image-2.4.27-powerpc-chrp
+kernel-image-2.4.27-powerpc-chrp-rs6k
+kernel-image-2.4.27-apus
+#endif
+#ifdef ARCH_sparc
+discover1
+initrd-tools
+kernel-image-2.4-sparc32
+kernel-image-2.4-sparc32-smp
+kernel-image-2.4-sparc64
+kernel-image-2.4-sparc64-smp
+kernel-image-2.4.27-1-sparc32
+kernel-image-2.4.27-1-sparc32-smp
+kernel-image-2.4.27-1-sparc64
+kernel-image-2.4.27-1-sparc64-smp
+kernel-image-2.6-sparc32
+kernel-image-2.6-sparc64
+kernel-image-2.6-sparc64-smp
+kernel-image-2.6.8-2-sparc32
+kernel-image-2.6.8-2-sparc64
+kernel-image-2.6.8-2-sparc64-smp
+#endif
+#ifdef ARCH_m68k
+fileutils
+kernel-image-2.2.25-mac
+kernel-image-2.4.27-amiga
+kernel-image-2.4.27-atari
+kernel-image-2.4.27-bvme6000
+kernel-image-2.4.27-mvme147
+kernel-image-2.4.27-mvme16x
+kernel-image-2.4.27-q40
+#endif
+#ifdef ARCH_arm
+discover1
+kernel-image-2.4.27-bast
+kernel-image-2.4.27-lart
+kernel-image-2.4.27-netwinder
+kernel-image-2.4.27-riscpc
+kernel-image-2.4.27-riscstation
+#endif
diff --git a/tasks/debian-installer b/tasks/debian-installer-etch
similarity index 100%
rename from tasks/debian-installer
rename to tasks/debian-installer-etch
diff --git a/tasks/debian-installer-sarge b/tasks/debian-installer-sarge
new file mode 100644
index 00000000..a867c27a
--- /dev/null
+++ b/tasks/debian-installer-sarge
@@ -0,0 +1,1842 @@
+/* List of udebs to be included so that debian-installer works fine 
+ *
+ * This list can be generated with the command:
+ * ../tools/generate_di_list
+ *
+ * DO NOT EDIT THIS FILE, edit the above script
+ *
+ * Last update: Sat Jan 15 20:54:15 MST 2005
+ */
+#ifdef ARCH_alpha
+aboot-installer
+archdetect
+autopartkit
+base-installer
+baseconfig-udeb
+brltty-modules-2.4.27-1-generic-di
+brltty-udeb
+bterm-unifont
+bugreporter-udeb
+cdebconf-text-udeb
+cdebootstrap-udeb
+cdrom-core-modules-2.4.27-1-generic-di
+cdrom-modules-2.4.27-1-generic-di
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+debootstrap-udeb
+dhcp-client-udeb
+di-utils
+di-utils-mapdevfs
+discover-data-udeb
+discover-udeb
+discover1-data-udeb
+discover1-udeb
+dmsetup-udeb
+e2fsprogs-udeb
+eject-udeb
+ethdetect
+evms-udeb
+ext3-modules-2.4.27-1-generic-di
+fat-modules-2.4.27-1-generic-di
+fb-modules-2.4.27-1-generic-di
+fbset-udeb
+fdisk-udeb
+hdparm-udeb
+hw-detect-full
+ide-core-modules-2.4.27-1-generic-di
+ide-modules-2.4.27-1-generic-di
+initrd-preseed
+ipv6-modules-2.4.27-1-generic-di
+isa-pnp-modules-2.4.27-1-generic-di
+jfs-modules-2.4.27-1-generic-di
+jfsutils-udeb
+kbd-chooser
+libblkid1-udeb
+libc6.1-udeb
+libcrypto0.9.7-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer4-udeb
+libdevmapper1.01-udeb
+libdirectfb-0.9-20-udeb
+libiw27-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+localechooser
+lowmem
+lvm10-udeb
+lvm2-udeb
+lvmcfg
+lvmcfg-utils
+md-modules-2.4.27-1-generic-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
+mii-diag-udeb
+mkreiser4-udeb
+mkreiserfs-udeb
+net-retriever
+netcfg
+network-console
+network-preseed
+nic-extra-modules-2.4.27-1-generic-di
+nic-modules-2.4.27-1-generic-di
+nic-shared-modules-2.4.27-1-generic-di
+nobootloader
+ntfstools-udeb
+openssh-client-udeb
+openssh-server-udeb
+os-prober
+parport-modules-2.4.27-1-generic-di
+partconf-find-partitions
+partconf-mkfstab
+parted-udeb
+partman
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+pcmcia-cs-udeb
+plip-modules-2.4.27-1-generic-di
+ppp-modules-2.4.27-1-generic-di
+ppp-udeb
+prebaseconfig
+preseed-common
+raidtools2-udeb
+reiser4progs-udeb
+scsi-common-modules-2.4.27-1-generic-di
+scsi-core-modules-2.4.27-1-generic-di
+scsi-extra-modules-2.4.27-1-generic-di
+scsi-modules-2.4.27-1-generic-di
+serial-modules-2.4.27-1-generic-di
+socket-modules-2.4.27-1-generic-di
+srm-modules-2.4.27-1-generic-di
+srm-reader
+usb-modules-2.4.27-1-generic-di
+usb-storage-modules-2.4.27-1-generic-di
+userdevfs
+wireless-tools-udeb
+xfs-modules-2.4.27-1-generic-di
+xfsprogs-udeb
+zlib1g-udeb
+#endif /* ARCH_alpha */
+#ifdef ARCH_arm
+archdetect
+autopartkit
+base-installer
+baseconfig-udeb
+brltty-udeb
+bterm-unifont
+bugreporter-udeb
+cdebconf-text-udeb
+cdebootstrap-udeb
+cdrom-core-modules-2.4.27-bast-di
+cdrom-core-modules-2.4.27-netwinder-di
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+debootstrap-udeb
+dhcp-client-udeb
+di-utils
+di-utils-mapdevfs
+discover-data-udeb
+discover-udeb
+discover1-data-udeb
+discover1-udeb
+dmsetup-udeb
+e2fsprogs-udeb
+eject-udeb
+ethdetect
+evms-udeb
+fat-modules-2.4.27-netwinder-di
+fat-modules-2.4.27-riscpc-di
+fat-modules-2.4.27-riscstation-di
+fbset-udeb
+fdisk-udeb
+hdparm-udeb
+hw-detect-full
+initrd-preseed
+isa-pnp-modules-2.4.27-netwinder-di
+jfsutils-udeb
+kbd-chooser
+libblkid1-udeb
+libc6-udeb
+libcrypto0.9.7-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer4-udeb
+libdevmapper1.01-udeb
+libdirectfb-0.9-20-udeb
+libiw27-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+localechooser
+loop-modules-2.4.27-bast-di
+loop-modules-2.4.27-netwinder-di
+loop-modules-2.4.27-riscpc-di
+lowmem
+lvm10-udeb
+lvm2-udeb
+lvmcfg
+lvmcfg-utils
+md-modules-2.4.27-netwinder-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
+mii-diag-udeb
+mkreiser4-udeb
+mkreiserfs-udeb
+net-retriever
+netcfg
+network-console
+network-preseed
+nic-extra-modules-2.4.27-netwinder-di
+nic-modules-2.4.27-netwinder-di
+nic-shared-modules-2.4.27-netwinder-di
+nobootloader
+ntfstools-udeb
+openssh-client-udeb
+openssh-server-udeb
+os-prober
+partconf-find-partitions
+partconf-mkfstab
+parted-udeb
+partman
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext2r0
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+pcmcia-cs-udeb
+ppp-udeb
+prebaseconfig
+preseed-common
+raidtools2-udeb
+reiser4progs-udeb
+scsi-common-modules-2.4.27-netwinder-di
+scsi-core-modules-2.4.27-netwinder-di
+scsi-extra-modules-2.4.27-netwinder-di
+scsi-modules-2.4.27-netwinder-di
+socket-modules-2.4.27-bast-di
+socket-modules-2.4.27-lart-di
+socket-modules-2.4.27-netwinder-di
+socket-modules-2.4.27-riscpc-di
+socket-modules-2.4.27-riscstation-di
+usb-modules-2.4.27-netwinder-di
+userdevfs
+wireless-tools-udeb
+xfsprogs-udeb
+zlib1g-udeb
+#endif /* ARCH_arm */
+#ifdef ARCH_hppa
+archdetect
+autopartkit
+base-installer
+baseconfig-udeb
+brltty-udeb
+bterm-unifont
+bugreporter-udeb
+cdebconf-text-udeb
+cdebootstrap-udeb
+cdrom-core-modules-2.6.8-1-32-di
+cdrom-core-modules-2.6.8-1-64-di
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+debootstrap-udeb
+dhcp-client-udeb
+di-utils
+di-utils-mapdevfs
+discover-data-udeb
+discover-udeb
+discover1-data-udeb
+discover1-udeb
+dmsetup-udeb
+e2fsprogs-udeb
+eject-udeb
+ethdetect
+evms-udeb
+ext3-modules-2.6.8-1-32-di
+ext3-modules-2.6.8-1-64-di
+fbset-udeb
+fdisk-udeb
+hdparm-udeb
+hw-detect-full
+ide-modules-2.6.8-1-32-di
+ide-modules-2.6.8-1-64-di
+initrd-preseed
+input-modules-2.6.8-1-32-di
+input-modules-2.6.8-1-64-di
+ipv6-modules-2.4.27-32-di
+ipv6-modules-2.4.27-64-di
+ipv6-modules-2.6.8-1-32-di
+ipv6-modules-2.6.8-1-64-di
+jfsutils-udeb
+kbd-chooser
+libblkid1-udeb
+libc6-udeb
+libcrypto0.9.7-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer4-udeb
+libdevmapper1.01-udeb
+libdirectfb-0.9-20-udeb
+libiw27-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+localechooser
+loop-modules-2.6.8-1-32-di
+loop-modules-2.6.8-1-64-di
+lowmem
+lvm10-udeb
+lvm2-udeb
+lvmcfg
+lvmcfg-utils
+md-modules-2.6.8-1-32-di
+md-modules-2.6.8-1-64-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
+mii-diag-udeb
+mkreiser4-udeb
+mkreiserfs-udeb
+net-retriever
+netcfg
+network-console
+network-preseed
+nic-modules-2.4.27-32-di
+nic-modules-2.4.27-64-di
+nic-modules-2.6.8-1-32-di
+nic-modules-2.6.8-1-64-di
+nobootloader
+ntfstools-udeb
+openssh-client-udeb
+openssh-server-udeb
+os-prober
+palo-installer
+partconf-find-partitions
+partconf-mkfstab
+parted-udeb
+partman
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-palo
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+pcmcia-cs-udeb
+ppp-modules-2.4.27-32-di
+ppp-modules-2.4.27-64-di
+ppp-modules-2.6.8-1-32-di
+ppp-modules-2.6.8-1-64-di
+ppp-udeb
+prebaseconfig
+preseed-common
+raidtools2-udeb
+reiser4progs-udeb
+scsi-modules-2.6.8-1-32-di
+scsi-modules-2.6.8-1-64-di
+usb-modules-2.6.8-1-32-di
+usb-modules-2.6.8-1-64-di
+usb-storage-modules-2.6.8-1-32-di
+usb-storage-modules-2.6.8-1-64-di
+userdevfs
+wireless-tools-udeb
+xfsprogs-udeb
+zlib1g-udeb
+#endif /* ARCH_hppa */
+#ifdef ARCH_hurd_i386
+baseconfig-udeb
+bugreporter-udeb
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+di-utils
+discover-data-udeb
+discover1-data-udeb
+e2fsprogs-udeb
+ethdetect
+fdisk-udeb
+hw-detect-full
+initrd-preseed
+libblkid1-udeb
+libc0.3-udeb
+libcrypto0.9.7-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+localechooser
+lowmem
+lvmcfg
+lvmcfg-utils
+mdcfg
+mdcfg-utils
+net-retriever
+network-console
+network-preseed
+nobootloader
+os-prober
+parted-udeb
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+prebaseconfig
+preseed-common
+userdevfs
+zlib1g-udeb
+#endif /* ARCH_hurd_i386 */
+#ifdef ARCH_i386
+acpi-modules-2.6.8-2-386-di
+archdetect
+autopartkit
+base-installer
+baseconfig-udeb
+brltty-modules-2.4.27-2-386-di
+brltty-udeb
+bterm-unifont
+bugreporter-udeb
+cdebconf-text-udeb
+cdebootstrap-udeb
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+debootstrap-udeb
+dhcp-client-udeb
+di-utils
+di-utils-mapdevfs
+dmidecode-udeb
+dmsetup-udeb
+e2fsprogs-udeb
+eject-udeb
+ethdetect
+evms-udeb
+ext3-modules-2.4.27-2-386-di
+ext3-modules-2.6.8-2-386-di
+fat-modules-2.4.27-2-386-di
+fat-modules-2.6.8-2-386-di
+fbset-udeb
+fdisk-udeb
+firewire-core-modules-2.4.27-2-386-di
+firewire-core-modules-2.6.8-2-386-di
+firmware-modules-2.4.27-2-386-di
+firmware-modules-2.6.8-2-386-di
+grub-installer
+hdparm-udeb
+hw-detect-full
+initrd-preseed
+ipv6-modules-2.4.27-2-386-di
+ipv6-modules-2.6.8-2-386-di
+irda-modules-2.4.27-2-386-di
+irda-modules-2.6.8-2-386-di
+jfs-modules-2.4.27-2-386-di
+jfs-modules-2.6.8-2-386-di
+jfsutils-udeb
+libblkid1-udeb
+libc6-udeb
+libcrypto0.9.7-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer4-udeb
+libdevmapper1.01-udeb
+libdirectfb-0.9-20-udeb
+libiw27-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+lilo-installer
+localechooser
+loop-modules-2.4.27-2-386-di
+loop-modules-2.6.8-2-386-di
+lowmem
+lvm10-udeb
+lvm2-udeb
+lvmcfg
+lvmcfg-utils
+md-modules-2.4.27-2-386-di
+md-modules-2.6.8-2-386-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
+mii-diag-udeb
+mkreiser4-udeb
+mkreiserfs-udeb
+net-retriever
+netcfg
+network-console
+network-preseed
+nic-extra-modules-2.4.27-2-386-di
+nic-extra-modules-2.6.8-2-386-di
+nic-modules-2.4.27-2-386-di
+nic-modules-2.6.8-2-386-di
+nic-pcmcia-modules-2.4.27-2-386-di
+nic-pcmcia-modules-2.6.8-2-386-di
+nic-shared-modules-2.4.27-2-386-di
+nic-shared-modules-2.6.8-2-386-di
+nic-usb-modules-2.4.27-2-386-di
+nic-usb-modules-2.6.8-2-386-di
+nobootloader
+ntfs-modules-2.4.27-2-386-di
+ntfs-modules-2.6.8-2-386-di
+ntfstools-udeb
+openssh-client-udeb
+openssh-server-udeb
+os-prober
+parport-modules-2.4.27-2-386-di
+parport-modules-2.6.8-2-386-di
+partconf-find-partitions
+partconf-mkfstab
+parted-udeb
+partman
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+pcmcia-cs-udeb
+pcmcia-modules-2.4.27-2-386-di
+pcmcia-modules-2.6.8-2-386-di
+pcmcia-storage-modules-2.4.27-2-386-di
+pcmcia-storage-modules-2.6.8-2-386-di
+plip-modules-2.4.27-2-386-di
+plip-modules-2.6.8-2-386-di
+ppp-modules-2.4.27-2-386-di
+ppp-modules-2.6.8-2-386-di
+ppp-udeb
+prebaseconfig
+preseed-common
+raidtools2-udeb
+reiser4progs-udeb
+reiserfs-modules-2.4.27-2-386-di
+reiserfs-modules-2.6.8-2-386-di
+sata-modules-2.4.27-2-386-di
+sata-modules-2.6.8-2-386-di
+scsi-common-modules-2.4.27-2-386-di
+scsi-common-modules-2.6.8-2-386-di
+scsi-extra-modules-2.4.27-2-386-di
+scsi-extra-modules-2.6.8-2-386-di
+scsi-modules-2.4.27-2-386-di
+scsi-modules-2.6.8-2-386-di
+serial-modules-2.4.27-2-386-di
+serial-modules-2.6.8-2-386-di
+ufs-modules-2.4.27-2-386-di
+ufs-modules-2.6.8-2-386-di
+wireless-tools-udeb
+xfs-modules-2.4.27-2-386-di
+xfs-modules-2.6.8-2-386-di
+xfsprogs-udeb
+zlib1g-udeb
+#endif /* ARCH_i386 */
+#ifdef ARCH_ia64
+archdetect
+autopartkit
+base-installer
+baseconfig-udeb
+brltty-modules-2.4.27-1-itanium-smp-di
+brltty-udeb
+bterm-unifont
+bugreporter-udeb
+cdebconf-text-udeb
+cdebootstrap-udeb
+cdrom-core-modules-2.4.27-1-itanium-smp-di
+cdrom-core-modules-2.6.8-1-itanium-smp-di
+cdrom-core-modules-2.6.8-2-itanium-smp-di
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+debootstrap-udeb
+dhcp-client-udeb
+di-utils
+di-utils-mapdevfs
+discover-data-udeb
+discover-udeb
+discover1-data-udeb
+discover1-udeb
+dmidecode-udeb
+dmsetup-udeb
+e2fsprogs-udeb
+efi-reader
+eject-udeb
+elilo-installer
+ethdetect
+evms-udeb
+ext3-modules-2.4.27-1-itanium-smp-di
+ext3-modules-2.6.8-1-itanium-smp-di
+ext3-modules-2.6.8-2-itanium-smp-di
+fat-modules-2.4.27-1-itanium-smp-di
+fat-modules-2.6.8-1-itanium-smp-di
+fat-modules-2.6.8-2-itanium-smp-di
+fb-modules-2.4.27-1-itanium-smp-di
+fb-modules-2.6.8-1-itanium-smp-di
+fb-modules-2.6.8-2-itanium-smp-di
+fbset-udeb
+fdisk-udeb
+firewire-core-modules-2.4.27-1-itanium-smp-di
+firewire-core-modules-2.6.8-1-itanium-smp-di
+firewire-core-modules-2.6.8-2-itanium-smp-di
+firmware-modules-2.4.27-1-itanium-smp-di
+firmware-modules-2.6.8-1-itanium-smp-di
+firmware-modules-2.6.8-2-itanium-smp-di
+hdparm-udeb
+hw-detect-full
+ide-core-modules-2.4.27-1-itanium-smp-di
+ide-core-modules-2.6.8-1-itanium-smp-di
+ide-core-modules-2.6.8-2-itanium-smp-di
+ide-modules-2.4.27-1-itanium-smp-di
+ide-modules-2.6.8-1-itanium-smp-di
+ide-modules-2.6.8-2-itanium-smp-di
+initrd-preseed
+input-modules-2.4.27-1-itanium-smp-di
+input-modules-2.6.8-1-itanium-smp-di
+input-modules-2.6.8-2-itanium-smp-di
+ipv6-modules-2.4.27-1-itanium-smp-di
+ipv6-modules-2.6.8-1-itanium-smp-di
+ipv6-modules-2.6.8-2-itanium-smp-di
+irda-modules-2.6.8-1-itanium-smp-di
+irda-modules-2.6.8-2-itanium-smp-di
+jfs-modules-2.6.8-1-itanium-smp-di
+jfs-modules-2.6.8-2-itanium-smp-di
+jfsutils-udeb
+kbd-chooser
+libblkid1-udeb
+libc6.1-udeb
+libcrypto0.9.7-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer4-udeb
+libdevmapper1.01-udeb
+libdirectfb-0.9-20-udeb
+libiw27-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+localechooser
+loop-modules-2.4.27-1-itanium-smp-di
+loop-modules-2.6.8-1-itanium-smp-di
+loop-modules-2.6.8-2-itanium-smp-di
+lowmem
+lvm10-udeb
+lvm2-udeb
+lvmcfg
+lvmcfg-utils
+md-modules-2.4.27-1-itanium-smp-di
+md-modules-2.6.8-1-itanium-smp-di
+md-modules-2.6.8-2-itanium-smp-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
+mii-diag-udeb
+mkreiser4-udeb
+mkreiserfs-udeb
+net-retriever
+netcfg
+network-console
+network-preseed
+nic-modules-2.4.27-1-itanium-smp-di
+nic-modules-2.6.8-1-itanium-smp-di
+nic-modules-2.6.8-2-itanium-smp-di
+nic-shared-modules-2.6.8-1-itanium-smp-di
+nic-shared-modules-2.6.8-2-itanium-smp-di
+nic-usb-modules-2.6.8-1-itanium-smp-di
+nic-usb-modules-2.6.8-2-itanium-smp-di
+nobootloader
+ntfs-modules-2.6.8-1-itanium-smp-di
+ntfs-modules-2.6.8-2-itanium-smp-di
+ntfstools-udeb
+openssh-client-udeb
+openssh-server-udeb
+os-prober
+parport-modules-2.4.27-1-itanium-smp-di
+parport-modules-2.6.8-1-itanium-smp-di
+parport-modules-2.6.8-2-itanium-smp-di
+partconf-find-partitions
+partconf-mkfstab
+parted-udeb
+partman
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-efi
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+pcmcia-cs-udeb
+pcmcia-modules-2.6.8-1-itanium-smp-di
+pcmcia-modules-2.6.8-2-itanium-smp-di
+plip-modules-2.4.27-1-itanium-smp-di
+plip-modules-2.6.8-1-itanium-smp-di
+plip-modules-2.6.8-2-itanium-smp-di
+ppp-modules-2.4.27-1-itanium-smp-di
+ppp-modules-2.6.8-1-itanium-smp-di
+ppp-modules-2.6.8-2-itanium-smp-di
+ppp-udeb
+prebaseconfig
+preseed-common
+raidtools2-udeb
+reiser4progs-udeb
+reiserfs-modules-2.4.27-1-itanium-smp-di
+reiserfs-modules-2.6.8-1-itanium-smp-di
+reiserfs-modules-2.6.8-2-itanium-smp-di
+sata-modules-2.6.8-1-itanium-smp-di
+sata-modules-2.6.8-2-itanium-smp-di
+scsi-core-modules-2.6.8-1-itanium-smp-di
+scsi-core-modules-2.6.8-2-itanium-smp-di
+scsi-modules-2.4.27-1-itanium-smp-di
+scsi-modules-2.6.8-1-itanium-smp-di
+scsi-modules-2.6.8-2-itanium-smp-di
+serial-modules-2.4.27-1-itanium-smp-di
+serial-modules-2.6.8-1-itanium-smp-di
+serial-modules-2.6.8-2-itanium-smp-di
+ufs-modules-2.6.8-1-itanium-smp-di
+ufs-modules-2.6.8-2-itanium-smp-di
+usb-modules-2.4.27-1-itanium-smp-di
+usb-modules-2.6.8-1-itanium-smp-di
+usb-modules-2.6.8-2-itanium-smp-di
+usb-storage-modules-2.4.27-1-itanium-smp-di
+usb-storage-modules-2.6.8-1-itanium-smp-di
+usb-storage-modules-2.6.8-2-itanium-smp-di
+userdevfs
+wireless-tools-udeb
+xfs-modules-2.4.27-1-itanium-smp-di
+xfs-modules-2.6.8-1-itanium-smp-di
+xfs-modules-2.6.8-2-itanium-smp-di
+xfsprogs-udeb
+zlib1g-udeb
+#endif /* ARCH_ia64 */
+#ifdef ARCH_m68k
+archdetect
+atari-fdisk-udeb
+autopartkit
+base-installer
+baseconfig-udeb
+brltty-udeb
+bterm-unifont
+bugreporter-udeb
+cdebconf-text-udeb
+cdebootstrap-udeb
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+debootstrap-udeb
+dhcp-client-udeb
+di-utils
+di-utils-mapdevfs
+discover-data-udeb
+discover-udeb
+discover1-data-udeb
+discover1-udeb
+dmsetup-udeb
+e2fsprogs-udeb
+eject-udeb
+ethdetect
+evms-udeb
+fat-modules-2.2.25-atari-di
+fat-modules-2.2.25-bvme6000-di
+fat-modules-2.2.25-mac-di
+fat-modules-2.2.25-mvme147-di
+fat-modules-2.2.25-mvme16x-di
+fat-modules-2.4.27-amiga-di
+fat-modules-2.4.27-atari-di
+fat-modules-2.4.27-bvme6000-di
+fat-modules-2.4.27-mvme147-di
+fat-modules-2.4.27-mvme16x-di
+fat-modules-2.4.27-q40-di
+fat-modules-2.6.8-amiga-di
+fat-modules-2.6.8-atari-di
+fat-modules-2.6.8-bvme6000-di
+fat-modules-2.6.8-hp-di
+fat-modules-2.6.8-mac-di
+fat-modules-2.6.8-mvme147-di
+fat-modules-2.6.8-mvme16x-di
+fat-modules-2.6.8-q40-di
+fat-modules-2.6.8-sun3-di
+fbset-udeb
+hdparm-udeb
+hw-detect-full
+initrd-preseed
+jfs-modules-2.4.27-amiga-di
+jfs-modules-2.4.27-atari-di
+jfs-modules-2.4.27-bvme6000-di
+jfs-modules-2.4.27-mvme147-di
+jfs-modules-2.4.27-mvme16x-di
+jfs-modules-2.4.27-q40-di
+jfs-modules-2.6.8-amiga-di
+jfs-modules-2.6.8-atari-di
+jfs-modules-2.6.8-bvme6000-di
+jfs-modules-2.6.8-hp-di
+jfs-modules-2.6.8-mac-di
+jfs-modules-2.6.8-mvme147-di
+jfs-modules-2.6.8-mvme16x-di
+jfs-modules-2.6.8-q40-di
+jfs-modules-2.6.8-sun3-di
+jfsutils-udeb
+kbd-chooser
+libblkid1-udeb
+libc6-udeb
+libcrypto0.9.7-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer4-udeb
+libdevmapper1.01-udeb
+libdirectfb-0.9-20-udeb
+libiw27-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+localechooser
+lowmem
+lvm10-udeb
+lvm2-udeb
+lvmcfg
+lvmcfg-utils
+mac-fdisk-udeb
+mdadm-udeb
+mdcfg
+mdcfg-utils
+mii-diag-udeb
+mkreiser4-udeb
+mkreiserfs-udeb
+net-retriever
+netcfg
+network-console
+network-preseed
+nic-shared-modules-2.2.25-atari-di
+nic-shared-modules-2.2.25-bvme6000-di
+nic-shared-modules-2.2.25-mac-di
+nic-shared-modules-2.2.25-mvme147-di
+nic-shared-modules-2.2.25-mvme16x-di
+nic-shared-modules-2.4.27-amiga-di
+nic-shared-modules-2.4.27-atari-di
+nic-shared-modules-2.4.27-bvme6000-di
+nic-shared-modules-2.4.27-mvme147-di
+nic-shared-modules-2.4.27-mvme16x-di
+nic-shared-modules-2.4.27-q40-di
+nic-shared-modules-2.6.8-amiga-di
+nic-shared-modules-2.6.8-atari-di
+nic-shared-modules-2.6.8-bvme6000-di
+nic-shared-modules-2.6.8-hp-di
+nic-shared-modules-2.6.8-mac-di
+nic-shared-modules-2.6.8-mvme147-di
+nic-shared-modules-2.6.8-mvme16x-di
+nic-shared-modules-2.6.8-q40-di
+nic-shared-modules-2.6.8-sun3-di
+nobootloader
+ntfstools-udeb
+openssh-client-udeb
+openssh-server-udeb
+os-prober
+partconf
+partconf-find-partitions
+partconf-mkfstab
+parted-udeb
+partitioner
+partman
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+pcmcia-cs-udeb
+ppp-modules-2.2.25-atari-di
+ppp-modules-2.2.25-bvme6000-di
+ppp-modules-2.2.25-mac-di
+ppp-modules-2.2.25-mvme147-di
+ppp-modules-2.2.25-mvme16x-di
+ppp-modules-2.4.27-amiga-di
+ppp-modules-2.4.27-atari-di
+ppp-modules-2.4.27-bvme6000-di
+ppp-modules-2.4.27-mvme147-di
+ppp-modules-2.4.27-mvme16x-di
+ppp-modules-2.4.27-q40-di
+ppp-modules-2.6.8-amiga-di
+ppp-modules-2.6.8-atari-di
+ppp-modules-2.6.8-bvme6000-di
+ppp-modules-2.6.8-hp-di
+ppp-modules-2.6.8-mac-di
+ppp-modules-2.6.8-mvme147-di
+ppp-modules-2.6.8-mvme16x-di
+ppp-modules-2.6.8-q40-di
+ppp-modules-2.6.8-sun3-di
+ppp-udeb
+prebaseconfig
+preseed-common
+raidtools2-udeb
+reiser4progs-udeb
+reiserfs-modules-2.4.27-amiga-di
+reiserfs-modules-2.4.27-atari-di
+reiserfs-modules-2.4.27-bvme6000-di
+reiserfs-modules-2.4.27-mvme147-di
+reiserfs-modules-2.4.27-mvme16x-di
+reiserfs-modules-2.4.27-q40-di
+reiserfs-modules-2.6.8-amiga-di
+reiserfs-modules-2.6.8-atari-di
+reiserfs-modules-2.6.8-bvme6000-di
+reiserfs-modules-2.6.8-hp-di
+reiserfs-modules-2.6.8-mac-di
+reiserfs-modules-2.6.8-mvme147-di
+reiserfs-modules-2.6.8-mvme16x-di
+reiserfs-modules-2.6.8-q40-di
+reiserfs-modules-2.6.8-sun3-di
+scsi-modules-2.2.25-atari-di
+scsi-modules-2.2.25-bvme6000-di
+scsi-modules-2.2.25-mac-di
+scsi-modules-2.2.25-mvme147-di
+scsi-modules-2.2.25-mvme16x-di
+scsi-modules-2.4.27-amiga-di
+scsi-modules-2.4.27-atari-di
+scsi-modules-2.4.27-bvme6000-di
+scsi-modules-2.4.27-mvme147-di
+scsi-modules-2.4.27-mvme16x-di
+scsi-modules-2.4.27-q40-di
+scsi-modules-2.6.8-amiga-di
+scsi-modules-2.6.8-atari-di
+scsi-modules-2.6.8-bvme6000-di
+scsi-modules-2.6.8-hp-di
+scsi-modules-2.6.8-mac-di
+scsi-modules-2.6.8-mvme147-di
+scsi-modules-2.6.8-mvme16x-di
+scsi-modules-2.6.8-q40-di
+scsi-modules-2.6.8-sun3-di
+userdevfs
+vmelilo-installer
+wireless-tools-udeb
+xfsprogs-udeb
+zlib1g-udeb
+#endif /* ARCH_m68k */
+#ifdef ARCH_mips
+arcboot-installer
+archdetect
+autopartkit
+base-installer
+baseconfig-udeb
+brltty-udeb
+bterm-unifont
+bugreporter-udeb
+cdebconf-text-udeb
+cdebootstrap-udeb
+cdrom-core-modules-2.4.27-sb1-swarm-bn-di
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+debootstrap-udeb
+dhcp-client-udeb
+di-utils
+di-utils-mapdevfs
+discover-data-udeb
+discover-udeb
+discover1-data-udeb
+discover1-udeb
+dmsetup-udeb
+e2fsprogs-udeb
+eject-udeb
+ethdetect
+evms-udeb
+fat-modules-2.4.27-sb1-swarm-bn-di
+fb-modules-2.4.27-sb1-swarm-bn-di
+fbset-udeb
+fdisk-udeb
+hdparm-udeb
+hw-detect-full
+initrd-preseed
+input-modules-2.4.27-sb1-swarm-bn-di
+ipv6-modules-2.4.27-r4k-ip22-di
+ipv6-modules-2.4.27-r5k-ip22-di
+ipv6-modules-2.4.27-sb1-swarm-bn-di
+jfs-modules-2.4.27-r4k-ip22-di
+jfs-modules-2.4.27-r5k-ip22-di
+jfs-modules-2.4.27-sb1-swarm-bn-di
+jfsutils-udeb
+kbd-chooser
+libblkid1-udeb
+libc6-udeb
+libcrypto0.9.7-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer4-udeb
+libdevmapper1.01-udeb
+libdirectfb-0.9-20-udeb
+libiw27-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+localechooser
+loop-modules-2.4.27-sb1-swarm-bn-di
+lowmem
+lvm10-udeb
+lvm2-udeb
+lvmcfg
+lvmcfg-utils
+md-modules-2.4.27-r4k-ip22-di
+md-modules-2.4.27-r5k-ip22-di
+md-modules-2.4.27-sb1-swarm-bn-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
+mii-diag-udeb
+mkreiser4-udeb
+mkreiserfs-udeb
+net-retriever
+netcfg
+network-console
+network-preseed
+nobootloader
+ntfstools-udeb
+openssh-client-udeb
+openssh-server-udeb
+os-prober
+partconf
+partconf-find-partitions
+partconf-mkfstab
+parted-udeb
+partitioner
+partman
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+pcmcia-cs-udeb
+pcmcia-storage-modules-2.4.27-sb1-swarm-bn-di
+ppp-modules-2.4.27-sb1-swarm-bn-di
+ppp-udeb
+prebaseconfig
+preseed-common
+raidtools2-udeb
+reiser4progs-udeb
+reiserfs-modules-2.4.27-r4k-ip22-di
+reiserfs-modules-2.4.27-r5k-ip22-di
+reiserfs-modules-2.4.27-sb1-swarm-bn-di
+sata-modules-2.4.27-sb1-swarm-bn-di
+scsi-common-modules-2.4.27-sb1-swarm-bn-di
+scsi-core-modules-2.4.27-sb1-swarm-bn-di
+scsi-modules-2.4.27-sb1-swarm-bn-di
+sibyl-installer
+usb-modules-2.4.27-sb1-swarm-bn-di
+usb-storage-modules-2.4.27-sb1-swarm-bn-di
+userdevfs
+wireless-tools-udeb
+xfs-modules-2.4.27-sb1-swarm-bn-di
+xfsprogs-udeb
+zlib1g-udeb
+#endif /* ARCH_mips */
+#ifdef ARCH_mipsel
+archdetect
+autopartkit
+base-installer
+baseconfig-udeb
+brltty-udeb
+bterm-unifont
+bugreporter-udeb
+cdebconf-text-udeb
+cdebootstrap-udeb
+cdrom-core-modules-2.4.27-r5k-cobalt-di
+cdrom-core-modules-2.4.27-sb1-swarm-bn-di
+choose-mirror
+cobalt-scripts
+colo-installer
+colo-udeb
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+debootstrap-udeb
+delo-installer
+dhcp-client-udeb
+di-utils
+di-utils-mapdevfs
+discover-data-udeb
+discover-udeb
+discover1-data-udeb
+discover1-udeb
+dmsetup-udeb
+e2fsprogs-udeb
+eject-udeb
+ethdetect
+evms-udeb
+fat-modules-2.4.27-r5k-cobalt-di
+fat-modules-2.4.27-sb1-swarm-bn-di
+fb-modules-2.4.27-sb1-swarm-bn-di
+fbset-udeb
+fdisk-udeb
+hdparm-udeb
+hw-detect-full
+initrd-preseed
+input-modules-2.4.27-sb1-swarm-bn-di
+ipv6-modules-2.4.27-r3k-kn02-di
+ipv6-modules-2.4.27-r4k-kn04-di
+ipv6-modules-2.4.27-r5k-cobalt-di
+ipv6-modules-2.4.27-sb1-swarm-bn-di
+jfs-modules-2.4.27-r5k-cobalt-di
+jfs-modules-2.4.27-sb1-swarm-bn-di
+jfsutils-udeb
+kbd-chooser
+libblkid1-udeb
+libc6-udeb
+libcrypto0.9.7-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer4-udeb
+libdevmapper1.01-udeb
+libdirectfb-0.9-20-udeb
+libiw27-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+localechooser
+loop-modules-2.4.27-r5k-cobalt-di
+loop-modules-2.4.27-sb1-swarm-bn-di
+lowmem
+lvm10-udeb
+lvm2-udeb
+lvmcfg
+lvmcfg-utils
+md-modules-2.4.27-r3k-kn02-di
+md-modules-2.4.27-r4k-kn04-di
+md-modules-2.4.27-r5k-cobalt-di
+md-modules-2.4.27-sb1-swarm-bn-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
+mii-diag-udeb
+mkreiser4-udeb
+mkreiserfs-udeb
+net-retriever
+netcfg
+network-console
+network-preseed
+nobootloader
+ntfstools-udeb
+openssh-client-udeb
+openssh-server-udeb
+os-prober
+partconf-find-partitions
+partconf-mkfstab
+parted-udeb
+partman
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext2r0
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+pcmcia-cs-udeb
+pcmcia-storage-modules-2.4.27-sb1-swarm-bn-di
+ppp-modules-2.4.27-r5k-cobalt-di
+ppp-modules-2.4.27-sb1-swarm-bn-di
+ppp-udeb
+prebaseconfig
+preseed-common
+raidtools2-udeb
+reiser4progs-udeb
+reiserfs-modules-2.4.27-r3k-kn02-di
+reiserfs-modules-2.4.27-r4k-kn04-di
+reiserfs-modules-2.4.27-r5k-cobalt-di
+reiserfs-modules-2.4.27-sb1-swarm-bn-di
+sata-modules-2.4.27-sb1-swarm-bn-di
+scsi-common-modules-2.4.27-sb1-swarm-bn-di
+scsi-core-modules-2.4.27-sb1-swarm-bn-di
+scsi-modules-2.4.27-sb1-swarm-bn-di
+sibyl-installer
+usb-modules-2.4.27-sb1-swarm-bn-di
+usb-storage-modules-2.4.27-sb1-swarm-bn-di
+userdevfs
+wireless-tools-udeb
+xfs-modules-2.4.27-r5k-cobalt-di
+xfs-modules-2.4.27-sb1-swarm-bn-di
+xfsprogs-udeb
+zlib1g-udeb
+#endif /* ARCH_mipsel */
+#ifdef ARCH_powerpc
+affs-modules-2.4.27-power3-di
+affs-modules-2.4.27-power4-di
+affs-modules-2.4.27-powerpc-di
+affs-modules-2.4.27-powerpc-small-di
+affs-modules-2.6.8-power3-di
+affs-modules-2.6.8-power4-di
+affs-modules-2.6.8-powerpc-di
+archdetect
+autopartkit
+base-installer
+baseconfig-udeb
+brltty-modules-2.4.27-power3-di
+brltty-modules-2.4.27-power4-di
+brltty-modules-2.4.27-powerpc-di
+brltty-modules-2.4.27-powerpc-small-di
+brltty-udeb
+bterm-unifont
+bugreporter-udeb
+cdebconf-text-udeb
+cdebootstrap-udeb
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+debootstrap-udeb
+dhcp-client-udeb
+di-utils
+di-utils-mapdevfs
+dmsetup-udeb
+e2fsprogs-udeb
+ethdetect
+evms-udeb
+ext2-modules-2.6.8-power3-di
+ext2-modules-2.6.8-power4-di
+ext2-modules-2.6.8-powerpc-di
+ext3-modules-2.4.27-powerpc-small-di
+ext3-modules-2.6.8-power3-di
+ext3-modules-2.6.8-power4-di
+ext3-modules-2.6.8-powerpc-di
+fat-modules-2.4.27-power3-di
+fat-modules-2.4.27-power4-di
+fat-modules-2.6.8-power3-di
+fat-modules-2.6.8-power4-di
+fat-modules-2.6.8-powerpc-di
+fb-modules-2.4.27-power3-di
+fb-modules-2.4.27-power4-di
+fb-modules-2.4.27-powerpc-di
+fb-modules-2.4.27-powerpc-small-di
+fb-modules-2.6.8-power3-di
+fb-modules-2.6.8-power4-di
+fb-modules-2.6.8-powerpc-di
+fbset-udeb
+fdisk-udeb
+firmware-modules-2.6.8-power3-di
+firmware-modules-2.6.8-power4-di
+firmware-modules-2.6.8-powerpc-di
+floppy-modules-2.4.27-power3-di
+floppy-modules-2.4.27-power4-di
+floppy-modules-2.4.27-powerpc-di
+floppy-modules-2.4.27-powerpc-small-di
+floppy-modules-2.6.8-power3-di
+floppy-modules-2.6.8-power4-di
+floppy-modules-2.6.8-powerpc-di
+hdparm-udeb
+hfs-modules-2.4.27-power3-di
+hfs-modules-2.4.27-power4-di
+hfs-modules-2.4.27-powerpc-di
+hfs-modules-2.4.27-powerpc-small-di
+hfs-modules-2.6.8-power3-di
+hfs-modules-2.6.8-power4-di
+hfs-modules-2.6.8-powerpc-di
+hw-detect-full
+initrd-preseed
+ipv6-modules-2.4.27-power3-di
+ipv6-modules-2.4.27-power4-di
+ipv6-modules-2.4.27-powerpc-di
+ipv6-modules-2.4.27-powerpc-small-di
+ipv6-modules-2.6.8-power3-di
+ipv6-modules-2.6.8-power4-di
+ipv6-modules-2.6.8-powerpc-di
+irda-modules-2.4.27-power3-di
+irda-modules-2.4.27-power4-di
+irda-modules-2.4.27-powerpc-di
+irda-modules-2.4.27-powerpc-small-di
+irda-modules-2.6.8-power3-di
+irda-modules-2.6.8-power4-di
+irda-modules-2.6.8-powerpc-di
+isa-pnp-modules-2.4.27-power3-di
+isa-pnp-modules-2.4.27-power4-di
+isa-pnp-modules-2.4.27-powerpc-di
+isa-pnp-modules-2.4.27-powerpc-small-di
+jfs-modules-2.4.27-apus-di
+jfs-modules-2.4.27-powerpc-small-di
+jfs-modules-2.6.8-power3-di
+jfs-modules-2.6.8-power4-di
+jfs-modules-2.6.8-powerpc-di
+jfsutils-udeb
+libblkid1-udeb
+libc6-udeb
+libcrypto0.9.7-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer4-udeb
+libdevmapper1.01-udeb
+libdirectfb-0.9-20-udeb
+libiw27-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+localechooser
+loop-modules-2.4.27-power3-di
+loop-modules-2.4.27-power4-di
+loop-modules-2.4.27-powerpc-di
+loop-modules-2.4.27-powerpc-small-di
+loop-modules-2.6.8-power3-di
+loop-modules-2.6.8-power4-di
+loop-modules-2.6.8-powerpc-di
+lowmem
+lvm10-udeb
+lvm2-udeb
+lvmcfg
+lvmcfg-utils
+mac-fdisk-udeb
+md-modules-2.4.27-apus-di
+md-modules-2.4.27-power3-di
+md-modules-2.4.27-power4-di
+md-modules-2.4.27-powerpc-di
+md-modules-2.4.27-powerpc-small-di
+md-modules-2.6.8-power3-di
+md-modules-2.6.8-power4-di
+md-modules-2.6.8-powerpc-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
+mii-diag-udeb
+mkreiser4-udeb
+mkreiserfs-udeb
+net-retriever
+netcfg
+network-console
+network-preseed
+nic-extra-modules-2.4.27-power3-di
+nic-extra-modules-2.4.27-power4-di
+nic-extra-modules-2.4.27-powerpc-di
+nic-extra-modules-2.4.27-powerpc-small-di
+nic-extra-modules-2.6.8-power3-di
+nic-extra-modules-2.6.8-power4-di
+nic-extra-modules-2.6.8-powerpc-di
+nic-modules-2.4.27-apus-di
+nic-modules-2.4.27-power3-di
+nic-modules-2.4.27-power4-di
+nic-modules-2.4.27-powerpc-di
+nic-modules-2.4.27-powerpc-small-di
+nic-modules-2.6.8-power3-di
+nic-modules-2.6.8-power4-di
+nic-modules-2.6.8-powerpc-di
+nic-pcmcia-modules-2.4.27-power3-di
+nic-pcmcia-modules-2.4.27-power4-di
+nic-pcmcia-modules-2.4.27-powerpc-di
+nic-pcmcia-modules-2.4.27-powerpc-small-di
+nic-pcmcia-modules-2.6.8-power3-di
+nic-pcmcia-modules-2.6.8-power4-di
+nic-pcmcia-modules-2.6.8-powerpc-di
+nic-shared-modules-2.4.27-power3-di
+nic-shared-modules-2.4.27-power4-di
+nic-shared-modules-2.4.27-powerpc-di
+nic-shared-modules-2.4.27-powerpc-small-di
+nic-shared-modules-2.6.8-power3-di
+nic-shared-modules-2.6.8-power4-di
+nic-shared-modules-2.6.8-powerpc-di
+nobootloader
+ntfstools-udeb
+openssh-client-udeb
+openssh-server-udeb
+os-prober
+parport-modules-2.4.27-apus-di
+parport-modules-2.4.27-powerpc-small-di
+partconf-find-partitions
+partconf-mkfstab
+parted-udeb
+partman
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-newworld
+partman-partitioning
+partman-prep
+partman-reiserfs
+partman-target
+partman-xfs
+plip-modules-2.4.27-apus-di
+plip-modules-2.4.27-power3-di
+plip-modules-2.4.27-power4-di
+plip-modules-2.4.27-powerpc-di
+plip-modules-2.4.27-powerpc-small-di
+pmac-fdisk-udeb
+ppp-modules-2.4.27-power3-di
+ppp-modules-2.4.27-power4-di
+ppp-modules-2.4.27-powerpc-di
+ppp-modules-2.4.27-powerpc-small-di
+ppp-modules-2.6.8-power3-di
+ppp-modules-2.6.8-power4-di
+ppp-modules-2.6.8-powerpc-di
+ppp-udeb
+prebaseconfig
+preseed-common
+quik-installer
+raidtools2-udeb
+reiser4progs-udeb
+reiserfs-modules-2.4.27-powerpc-small-di
+reiserfs-modules-2.6.8-power3-di
+reiserfs-modules-2.6.8-power4-di
+reiserfs-modules-2.6.8-powerpc-di
+sata-modules-2.6.8-power3-di
+sata-modules-2.6.8-power4-di
+sata-modules-2.6.8-powerpc-di
+scsi-extra-modules-2.4.27-powerpc-small-di
+scsi-extra-modules-2.6.8-power3-di
+scsi-extra-modules-2.6.8-power4-di
+scsi-extra-modules-2.6.8-powerpc-di
+serial-modules-2.4.27-powerpc-di
+serial-modules-2.4.27-powerpc-small-di
+serial-modules-2.6.8-power3-di
+serial-modules-2.6.8-power4-di
+serial-modules-2.6.8-powerpc-di
+ufs-modules-2.4.27-power3-di
+ufs-modules-2.4.27-power4-di
+ufs-modules-2.4.27-powerpc-di
+ufs-modules-2.4.27-powerpc-small-di
+ufs-modules-2.6.8-power3-di
+ufs-modules-2.6.8-power4-di
+ufs-modules-2.6.8-powerpc-di
+wireless-tools-udeb
+xfs-modules-2.4.27-powerpc-small-di
+xfs-modules-2.6.8-power3-di
+xfs-modules-2.6.8-power4-di
+xfs-modules-2.6.8-powerpc-di
+xfsprogs-udeb
+yaboot-installer
+zlib1g-udeb
+#endif /* ARCH_powerpc */
+#ifdef ARCH_s390
+archdetect
+autopartkit
+base-installer
+baseconfig-udeb
+brltty-udeb
+bterm-unifont
+bugreporter-udeb
+cdebconf-text-udeb
+cdebootstrap-udeb
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+debootstrap-udeb
+dhcp-client-udeb
+di-utils
+di-utils-mapdevfs
+discover-data-udeb
+discover-udeb
+discover1-data-udeb
+discover1-udeb
+dmsetup-udeb
+e2fsprogs-udeb
+eject-udeb
+ethdetect
+evms-udeb
+fbset-udeb
+hdparm-udeb
+hw-detect-full
+initrd-preseed
+jfsutils-udeb
+libblkid1-udeb
+libc6-udeb
+libcrypto0.9.7-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer4-udeb
+libdevmapper1.01-udeb
+libdirectfb-0.9-20-udeb
+libiw27-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+localechooser
+lowmem
+lvm10-udeb
+lvm2-udeb
+lvmcfg
+lvmcfg-utils
+md-modules-2.4.27-1-s390-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
+mii-diag-udeb
+mkreiser4-udeb
+mkreiserfs-udeb
+net-retriever
+network-console
+network-preseed
+nic-modules-2.4.27-1-s390-di
+nobootloader
+ntfstools-udeb
+openssh-client-udeb
+openssh-server-udeb
+os-prober
+partconf
+partconf-find-partitions
+partconf-mkfstab
+parted-udeb
+partitioner
+partman
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+ppp-udeb
+prebaseconfig
+preseed-common
+raidtools2-udeb
+reiser4progs-udeb
+s390-dasd
+s390-netdevice
+s390-tools-udeb
+scsi-core-modules-2.4.27-1-s390-di
+scsi-modules-2.4.27-1-s390-di
+userdevfs
+wireless-tools-udeb
+xfs-modules-2.4.27-1-s390-di
+xfsprogs-udeb
+zipl-installer
+zlib1g-udeb
+#endif /* ARCH_s390 */
+#ifdef ARCH_sparc
+archdetect
+autopartkit
+base-installer
+baseconfig-udeb
+brltty-udeb
+bterm-unifont
+bugreporter-udeb
+cdebconf-text-udeb
+cdebootstrap-udeb
+cdrom-core-modules-2.4.27-1-sparc32-di
+cdrom-core-modules-2.4.27-1-sparc64-di
+cdrom-core-modules-2.6.8-1-sparc32-di
+cdrom-core-modules-2.6.8-1-sparc64-di
+cdrom-core-modules-2.6.8-2-sparc32-di
+cdrom-core-modules-2.6.8-2-sparc64-di
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+debootstrap-udeb
+dhcp-client-udeb
+di-utils
+di-utils-mapdevfs
+discover-data-udeb
+discover-udeb
+discover1-data-udeb
+discover1-udeb
+dmsetup-udeb
+e2fsprogs-udeb
+eject-udeb
+ethdetect
+evms-udeb
+ext3-modules-2.4.27-1-sparc32-di
+ext3-modules-2.4.27-1-sparc64-di
+ext3-modules-2.6.8-1-sparc32-di
+ext3-modules-2.6.8-1-sparc64-di
+ext3-modules-2.6.8-2-sparc32-di
+ext3-modules-2.6.8-2-sparc64-di
+fat-modules-2.6.8-1-sparc32-di
+fat-modules-2.6.8-1-sparc64-di
+fat-modules-2.6.8-2-sparc32-di
+fat-modules-2.6.8-2-sparc64-di
+fbset-udeb
+fdisk-udeb
+firewire-core-modules-2.4.27-1-sparc64-di
+firmware-modules-2.4.27-1-sparc64-di
+hdparm-udeb
+hw-detect-full
+ide-modules-2.4.27-1-sparc64-di
+ide-modules-2.6.8-1-sparc64-di
+ide-modules-2.6.8-2-sparc64-di
+initrd-preseed
+ipv6-modules-2.4.27-1-sparc32-di
+ipv6-modules-2.4.27-1-sparc64-di
+ipv6-modules-2.6.8-1-sparc32-di
+ipv6-modules-2.6.8-1-sparc64-di
+ipv6-modules-2.6.8-2-sparc32-di
+ipv6-modules-2.6.8-2-sparc64-di
+jfsutils-udeb
+kbd-chooser
+libblkid1-udeb
+libc6-udeb
+libcrypto0.9.7-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer4-udeb
+libdevmapper1.01-udeb
+libdirectfb-0.9-20-udeb
+libiw27-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+localechooser
+loop-modules-2.4.27-1-sparc32-di
+loop-modules-2.4.27-1-sparc64-di
+lowmem
+lvm10-udeb
+lvm2-udeb
+lvmcfg
+lvmcfg-utils
+md-modules-2.4.27-1-sparc32-di
+md-modules-2.4.27-1-sparc64-di
+md-modules-2.6.8-1-sparc32-di
+md-modules-2.6.8-1-sparc64-di
+md-modules-2.6.8-2-sparc32-di
+md-modules-2.6.8-2-sparc64-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
+mii-diag-udeb
+mkreiser4-udeb
+mkreiserfs-udeb
+net-retriever
+netcfg
+network-console
+network-preseed
+nic-modules-2.4.27-1-sparc32-di
+nic-modules-2.4.27-1-sparc64-di
+nic-modules-2.6.8-1-sparc32-di
+nic-modules-2.6.8-1-sparc64-di
+nic-modules-2.6.8-2-sparc32-di
+nic-modules-2.6.8-2-sparc64-di
+nobootloader
+ntfstools-udeb
+openssh-client-udeb
+openssh-server-udeb
+os-prober
+partconf-find-partitions
+partconf-mkfstab
+parted-udeb
+partman
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+pcmcia-cs-udeb
+plip-modules-2.6.8-1-sparc32-di
+plip-modules-2.6.8-1-sparc64-di
+plip-modules-2.6.8-2-sparc32-di
+plip-modules-2.6.8-2-sparc64-di
+ppp-modules-2.4.27-1-sparc32-di
+ppp-modules-2.4.27-1-sparc64-di
+ppp-modules-2.6.8-1-sparc32-di
+ppp-modules-2.6.8-1-sparc64-di
+ppp-modules-2.6.8-2-sparc32-di
+ppp-modules-2.6.8-2-sparc64-di
+ppp-udeb
+prebaseconfig
+preseed-common
+raidtools2-udeb
+reiser4progs-udeb
+reiserfs-modules-2.4.27-1-sparc32-di
+reiserfs-modules-2.4.27-1-sparc64-di
+reiserfs-modules-2.6.8-1-sparc32-di
+reiserfs-modules-2.6.8-1-sparc64-di
+reiserfs-modules-2.6.8-2-sparc32-di
+reiserfs-modules-2.6.8-2-sparc64-di
+scsi-common-modules-2.6.8-1-sparc32-di
+scsi-common-modules-2.6.8-1-sparc64-di
+scsi-common-modules-2.6.8-2-sparc32-di
+scsi-common-modules-2.6.8-2-sparc64-di
+scsi-core-modules-2.4.27-1-sparc32-di
+scsi-core-modules-2.4.27-1-sparc64-di
+scsi-core-modules-2.6.8-1-sparc32-di
+scsi-core-modules-2.6.8-1-sparc64-di
+scsi-core-modules-2.6.8-2-sparc32-di
+scsi-core-modules-2.6.8-2-sparc64-di
+scsi-modules-2.4.27-1-sparc32-di
+scsi-modules-2.4.27-1-sparc64-di
+silo-installer
+usb-modules-2.4.27-1-sparc64-di
+usb-modules-2.6.8-1-sparc64-di
+usb-modules-2.6.8-2-sparc64-di
+userdevfs
+wireless-tools-udeb
+xfs-modules-2.4.27-1-sparc32-di
+xfs-modules-2.4.27-1-sparc64-di
+xfs-modules-2.6.8-1-sparc32-di
+xfs-modules-2.6.8-1-sparc64-di
+xfs-modules-2.6.8-2-sparc32-di
+xfs-modules-2.6.8-2-sparc64-di
+xfsprogs-udeb
+zlib1g-udeb
+#endif /* ARCH_sparc */
+#ifdef ARCH_sh
+baseconfig-udeb
+bugreporter-udeb
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+di-utils
+discover-data-udeb
+discover1-data-udeb
+ethdetect
+hw-detect-full
+initrd-preseed
+localechooser
+lowmem
+lvmcfg
+lvmcfg-utils
+mdcfg
+mdcfg-utils
+net-retriever
+network-preseed
+nobootloader
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-reiserfs
+partman-target
+partman-xfs
+prebaseconfig
+preseed-common
+userdevfs
+#endif /* ARCH_sh */
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 6aae5534..38fb371c 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -5,7 +5,7 @@
 # MIRROR, CODENAME
 
 DATE=`date`
-cat > debian-installer+kernel << EOF
+cat > debian-installer+kernel-$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.
@@ -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
+  >> debian-installer+kernel-$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
+  >> debian-installer+kernel-$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
+  >> debian-installer+kernel-$CODENAME
 
-cat >> debian-installer+kernel << EOF
+cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 #ifdef ARCH_amd64
 EOF
@@ -75,7 +75,7 @@ else
 	  >> debian-installer+kernel
 fi
 	 
-cat >> debian-installer+kernel << EOF
+cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 #ifdef ARCH_alpha
 aboot
@@ -85,9 +85,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
+  >> debian-installer+kernel-$CODENAME
 
-cat >> debian-installer+kernel << EOF
+cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 #ifdef ARCH_hppa
 discover1
@@ -95,9 +95,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
+  >> debian-installer+kernel-$CODENAME
 
-cat >> debian-installer+kernel << EOF
+cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 #ifdef ARCH_ia64
 discover1
@@ -106,18 +106,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
+  >> debian-installer+kernel-$CODENAME
 /bin/sed -n 's/Package: \(kernel-image-2\.4-.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
-  >> debian-installer+kernel
+  >> debian-installer+kernel-$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
+  >> debian-installer+kernel-$CODENAME
 /bin/sed -n 's/Package: \(kernel-image-2\.6-.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
-  >> debian-installer+kernel
+  >> debian-installer+kernel-$CODENAME
 
-cat >> debian-installer+kernel << EOF
+cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 #ifdef ARCH_mips
 arcboot
@@ -128,10 +128,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
+                >> debian-installer+kernel-$CODENAME
 done
 
-cat >> debian-installer+kernel << EOF
+cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 #ifdef ARCH_mipsel
 delo
@@ -142,10 +142,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
+                >> debian-installer+kernel-$CODENAME
 done
 
-cat >> debian-installer+kernel << EOF
+cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 #ifdef ARCH_powerpc
 discover1
@@ -163,10 +163,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
+                >> debian-installer+kernel-$CODENAME
 done
 
-cat >> debian-installer+kernel << EOF
+cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 #ifdef ARCH_sparc
 discover1
@@ -175,9 +175,9 @@ EOF
 
 /bin/sed -n 's/Package: \(kernel-image-.*-sparc.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-sparc/Packages \
-  >> debian-installer+kernel
+  >> debian-installer+kernel-$CODENAME
 
-cat >> debian-installer+kernel << EOF
+cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 #ifdef ARCH_m68k
 fileutils
@@ -186,21 +186,21 @@ 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
+#  >> 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
+#  >> 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
+  >> debian-installer+kernel-$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
+  grep -v mac >> debian-installer+kernel-$CODENAME
 
-cat >> debian-installer+kernel << EOF
+cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 #ifdef ARCH_arm
 discover1
@@ -208,8 +208,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
+  >> debian-installer+kernel-$CODENAME
 
-cat >> debian-installer+kernel << EOF
+cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 EOF
diff --git a/tools/generate_di_list b/tools/generate_di_list
index b9fef8cd..f2a093b9 100755
--- a/tools/generate_di_list
+++ b/tools/generate_di_list
@@ -2,11 +2,14 @@
 # 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, BASEDIR
+die "Missing \$MIRROR variable" unless $ENV{MIRROR};
+die "Missing \$DI_CODENAME variable" unless $ENV{DI_CODENAME};
+
 my @ARCHES=qw{alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel
               powerpc s390 sparc sh amd64};
 my $DATE=`date`;
 chomp $DATE;
-open(OUT, ">debian-installer") || die "write: $!";
+open(OUT, ">debian-installer-$ENV{DI_CODENAME}") || die "write: $!";
 print OUT << "EOF";
 /* List of udebs to be included so that debian-installer works fine 
  *
@@ -21,9 +24,6 @@ EOF
 
 my @common_excludes = read_exclude("exclude-udebs");
 
-die "Missing \$MIRROR variable" unless $ENV{MIRROR};
-die "Missing \$DI_CODENAME variable" unless $ENV{DI_CODENAME};
-
 foreach my $arch (@ARCHES) {
 	my $packagefile="$ENV{MIRROR}/dists/$ENV{DI_CODENAME}/main/debian-installer/binary-$arch/Packages";
 	unless (-f $packagefile) {