diff --git a/etchnhalf/tasks/Debian_etch b/etchnhalf/tasks/Debian_etch
index 262a384f..55ec47d3 100644
--- a/etchnhalf/tasks/Debian_etch
+++ b/etchnhalf/tasks/Debian_etch
@@ -6,6 +6,7 @@
 
 /* Packages that should really be on CD1 */
 #include <debian-installer+kernel-etch>
+#include <base-etch>
 #include <forcd1-etch>
 #include <task-essential-etch>
 
diff --git a/etchnhalf/tasks/Debian_etch-kde b/etchnhalf/tasks/Debian_etch-kde
index 0b98aba2..4981c9eb 100644
--- a/etchnhalf/tasks/Debian_etch-kde
+++ b/etchnhalf/tasks/Debian_etch-kde
@@ -7,6 +7,7 @@
 
 /* Packages that should really be on CD1 */\
 #include <debian-installer+kernel-etch>
+#include <base-etch>
 #include <forcd1>
 #include <task-essential-etch-kde>
 
diff --git a/etchnhalf/tasks/Debian_etch-xfce b/etchnhalf/tasks/Debian_etch-xfce
index dea9e1f7..c79021cb 100644
--- a/etchnhalf/tasks/Debian_etch-xfce
+++ b/etchnhalf/tasks/Debian_etch-xfce
@@ -6,7 +6,11 @@
  */
 
 /* Packages that should really be on CD1 */\
+/* Note that the use of debian-installer+kernel-sid is a TEMPORARY HACK
+ * to make sid d-i be included on the kde CD. sid d-i is needed because
+ * the version of preseed in sid is needed */
 #include <debian-installer+kernel-etch>
+#include <base-etch>
 #include <forcd1>
 #include <task-essential-etch-xfce>
 
diff --git a/etchnhalf/tasks/debian-installer+kernel-etch b/etchnhalf/tasks/debian-installer+kernel-etch
index 8e5c0a22..6d60cc31 100644
--- a/etchnhalf/tasks/debian-installer+kernel-etch
+++ b/etchnhalf/tasks/debian-installer+kernel-etch
@@ -9,7 +9,7 @@
  *
  * DO NOT EDIT THIS FILE, edit the above script
  *
- * Last update: Sun Aug 19 00:53:39 CEST 2007
+ * Last update: Mon Feb 18 15:22:54 CET 2008
  */
 
 #include <debian-installer-etch>
@@ -189,3 +189,14 @@ linux-image-2.6-powerpc64
 linux-image-2.6-prep
 #endif
 
+#ifdef ARCH_m68k
+fileutils
+amiboot
+atari-bootstrap
+emile
+vmelilo
+linux-image-2.6-amiga
+linux-image-2.6-mac
+
+#endif
+
diff --git a/etchnhalf/tasks/debian-installer-etch b/etchnhalf/tasks/debian-installer-etch
index 7447b45f..78874bd9 100644
--- a/etchnhalf/tasks/debian-installer-etch
+++ b/etchnhalf/tasks/debian-installer-etch
@@ -5,7 +5,7 @@
  *
  * DO NOT EDIT THIS FILE, edit the above script
  *
- * Last update: Sun Aug 19 00:53:37 CEST 2007
+ * Last update: Mon Feb 18 15:22:52 CET 2008
  */
 #ifdef ARCH_alpha
 aboot-installer
@@ -17,10 +17,8 @@ base-installer
 beep-udeb
 bterm-unifont
 cdebconf-newt-entropy
-cdrom-core-modules-2.6.18-4-alpha-generic-di
-cdrom-core-modules-2.6.18-5-alpha-generic-di
-cdrom-modules-2.6.18-4-alpha-generic-di
-cdrom-modules-2.6.18-5-alpha-generic-di
+cdrom-core-modules-2.6.18-6-alpha-generic-di
+cdrom-modules-2.6.18-6-alpha-generic-di
 cfdisk-udeb
 choose-mirror
 choose-mirror-bin
@@ -33,10 +31,8 @@ console-keymaps-dec
 console-keymaps-mac
 console-keymaps-sun
 console-keymaps-usb
-crc-modules-2.6.18-4-alpha-generic-di
-crc-modules-2.6.18-5-alpha-generic-di
-crypto-modules-2.6.18-4-alpha-generic-di
-crypto-modules-2.6.18-5-alpha-generic-di
+crc-modules-2.6.18-6-alpha-generic-di
+crypto-modules-2.6.18-6-alpha-generic-di
 cryptsetup-udeb
 debian-archive-keyring-udeb
 debootstrap-udeb
@@ -50,27 +46,19 @@ dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
-ext3-modules-2.6.18-4-alpha-generic-di
-ext3-modules-2.6.18-5-alpha-generic-di
-fat-modules-2.6.18-4-alpha-generic-di
-fat-modules-2.6.18-5-alpha-generic-di
-fb-modules-2.6.18-4-alpha-generic-di
-fb-modules-2.6.18-5-alpha-generic-di
+ext3-modules-2.6.18-6-alpha-generic-di
+fat-modules-2.6.18-6-alpha-generic-di
+fb-modules-2.6.18-6-alpha-generic-di
 fdisk-udeb
 finish-install
-firmware-modules-2.6.18-4-alpha-generic-di
-firmware-modules-2.6.18-5-alpha-generic-di
+firmware-modules-2.6.18-6-alpha-generic-di
 gnupg-udeb
 gpgv-udeb
 gtk2-engines-udeb
-ide-core-modules-2.6.18-4-alpha-generic-di
-ide-core-modules-2.6.18-5-alpha-generic-di
-ide-modules-2.6.18-4-alpha-generic-di
-ide-modules-2.6.18-5-alpha-generic-di
-ipv6-modules-2.6.18-4-alpha-generic-di
-ipv6-modules-2.6.18-5-alpha-generic-di
-jfs-modules-2.6.18-4-alpha-generic-di
-jfs-modules-2.6.18-5-alpha-generic-di
+ide-core-modules-2.6.18-6-alpha-generic-di
+ide-modules-2.6.18-6-alpha-generic-di
+ipv6-modules-2.6.18-6-alpha-generic-di
+jfs-modules-2.6.18-6-alpha-generic-di
 jfsutils-udeb
 kbd-chooser
 klibc-utils-floppy-udeb
@@ -89,14 +77,12 @@ libsysfs2-udeb
 libtextwrap1-udeb
 libusb-0.1-udeb
 libuuid1-udeb
-loop-aes-modules-2.6.18-4-alpha-generic-di
-loop-aes-modules-2.6.18-5-alpha-generic-di
+loop-aes-modules-2.6.18-6-alpha-generic-di
 lowmem
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.6.18-4-alpha-generic-di
-md-modules-2.6.18-5-alpha-generic-di
+md-modules-2.6.18-6-alpha-generic-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
@@ -108,20 +94,16 @@ net-retriever
 netcfg
 network-console
 network-preseed
-nic-extra-modules-2.6.18-4-alpha-generic-di
-nic-extra-modules-2.6.18-5-alpha-generic-di
-nic-modules-2.6.18-4-alpha-generic-di
-nic-modules-2.6.18-5-alpha-generic-di
-nic-shared-modules-2.6.18-4-alpha-generic-di
-nic-shared-modules-2.6.18-5-alpha-generic-di
+nic-extra-modules-2.6.18-6-alpha-generic-di
+nic-modules-2.6.18-6-alpha-generic-di
+nic-shared-modules-2.6.18-6-alpha-generic-di
 nobootloader
 ntfsprogs-udeb
 oldsys-preseed
 openssh-client-udeb
 openssh-server-udeb
 os-prober-udeb
-parport-modules-2.6.18-4-alpha-generic-di
-parport-modules-2.6.18-5-alpha-generic-di
+parport-modules-2.6.18-6-alpha-generic-di
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
@@ -147,43 +129,30 @@ pciutils-udeb
 pcmcia-cs-udeb
 pcmciautils-udeb
 pkgsel
-plip-modules-2.6.18-4-alpha-generic-di
-plip-modules-2.6.18-5-alpha-generic-di
-ppp-modules-2.6.18-4-alpha-generic-di
-ppp-modules-2.6.18-5-alpha-generic-di
+plip-modules-2.6.18-6-alpha-generic-di
+ppp-modules-2.6.18-6-alpha-generic-di
 ppp-udeb
 pwgen-udeb
-reiserfs-modules-2.6.18-4-alpha-generic-di
-reiserfs-modules-2.6.18-5-alpha-generic-di
+reiserfs-modules-2.6.18-6-alpha-generic-di
 rescue-mode
-sata-modules-2.6.18-4-alpha-generic-di
-sata-modules-2.6.18-5-alpha-generic-di
+sata-modules-2.6.18-6-alpha-generic-di
 save-logs
-scsi-common-modules-2.6.18-4-alpha-generic-di
-scsi-common-modules-2.6.18-5-alpha-generic-di
-scsi-core-modules-2.6.18-4-alpha-generic-di
-scsi-core-modules-2.6.18-5-alpha-generic-di
-scsi-extra-modules-2.6.18-4-alpha-generic-di
-scsi-extra-modules-2.6.18-5-alpha-generic-di
-scsi-modules-2.6.18-4-alpha-generic-di
-scsi-modules-2.6.18-5-alpha-generic-di
-srm-modules-2.6.18-4-alpha-generic-di
-srm-modules-2.6.18-5-alpha-generic-di
+scsi-common-modules-2.6.18-6-alpha-generic-di
+scsi-core-modules-2.6.18-6-alpha-generic-di
+scsi-extra-modules-2.6.18-6-alpha-generic-di
+scsi-modules-2.6.18-6-alpha-generic-di
+srm-modules-2.6.18-6-alpha-generic-di
 srm-reader
 strace-udeb
 tzsetup-udeb
-usb-modules-2.6.18-4-alpha-generic-di
-usb-modules-2.6.18-5-alpha-generic-di
-usb-serial-modules-2.6.18-4-alpha-generic-di
-usb-serial-modules-2.6.18-5-alpha-generic-di
-usb-storage-modules-2.6.18-4-alpha-generic-di
-usb-storage-modules-2.6.18-5-alpha-generic-di
+usb-modules-2.6.18-6-alpha-generic-di
+usb-serial-modules-2.6.18-6-alpha-generic-di
+usb-storage-modules-2.6.18-6-alpha-generic-di
 usbutils-udeb
 user-setup-udeb
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.6.18-4-alpha-generic-di
-xfs-modules-2.6.18-5-alpha-generic-di
+xfs-modules-2.6.18-6-alpha-generic-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_alpha */
@@ -197,10 +166,8 @@ base-installer
 beep-udeb
 bterm-unifont
 cdebconf-newt-entropy
-cdrom-core-modules-2.6.18-4-footbridge-di
-cdrom-core-modules-2.6.18-4-iop32x-di
-cdrom-core-modules-2.6.18-5-footbridge-di
-cdrom-core-modules-2.6.18-5-iop32x-di
+cdrom-core-modules-2.6.18-6-footbridge-di
+cdrom-core-modules-2.6.18-6-iop32x-di
 cfdisk-udeb
 choose-mirror
 choose-mirror-bin
@@ -213,12 +180,9 @@ console-keymaps-dec
 console-keymaps-mac
 console-keymaps-sun
 console-keymaps-usb
-crc-modules-2.6.18-4-footbridge-di
-crc-modules-2.6.18-4-iop32x-di
-crc-modules-2.6.18-4-ixp4xx-di
-crc-modules-2.6.18-5-footbridge-di
-crc-modules-2.6.18-5-iop32x-di
-crc-modules-2.6.18-5-ixp4xx-di
+crc-modules-2.6.18-6-footbridge-di
+crc-modules-2.6.18-6-iop32x-di
+crc-modules-2.6.18-6-ixp4xx-di
 cryptsetup-udeb
 debian-archive-keyring-udeb
 debootstrap-udeb
@@ -232,18 +196,12 @@ dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
-ext3-modules-2.6.18-4-iop32x-di
-ext3-modules-2.6.18-4-ixp4xx-di
-ext3-modules-2.6.18-5-iop32x-di
-ext3-modules-2.6.18-5-ixp4xx-di
-fat-modules-2.6.18-4-footbridge-di
-fat-modules-2.6.18-4-iop32x-di
-fat-modules-2.6.18-4-ixp4xx-di
-fat-modules-2.6.18-4-rpc-di
-fat-modules-2.6.18-5-footbridge-di
-fat-modules-2.6.18-5-iop32x-di
-fat-modules-2.6.18-5-ixp4xx-di
-fat-modules-2.6.18-5-rpc-di
+ext3-modules-2.6.18-6-iop32x-di
+ext3-modules-2.6.18-6-ixp4xx-di
+fat-modules-2.6.18-6-footbridge-di
+fat-modules-2.6.18-6-iop32x-di
+fat-modules-2.6.18-6-ixp4xx-di
+fat-modules-2.6.18-6-rpc-di
 fdisk-udeb
 finish-install
 flash-kernel-installer
@@ -251,14 +209,10 @@ glantank-installer
 gnupg-udeb
 gpgv-udeb
 gtk2-engines-udeb
-ide-core-modules-2.6.18-4-iop32x-di
-ide-core-modules-2.6.18-5-iop32x-di
-ide-modules-2.6.18-4-footbridge-di
-ide-modules-2.6.18-4-iop32x-di
-ide-modules-2.6.18-5-footbridge-di
-ide-modules-2.6.18-5-iop32x-di
-input-modules-2.6.18-4-ixp4xx-di
-input-modules-2.6.18-5-ixp4xx-di
+ide-core-modules-2.6.18-6-iop32x-di
+ide-modules-2.6.18-6-footbridge-di
+ide-modules-2.6.18-6-iop32x-di
+input-modules-2.6.18-6-ixp4xx-di
 jfsutils-udeb
 kbd-chooser
 klibc-utils-floppy-udeb
@@ -277,32 +231,21 @@ libsysfs2-udeb
 libtextwrap1-udeb
 libusb-0.1-udeb
 libuuid1-udeb
-loop-aes-modules-2.6.18-4-footbridge-di
-loop-aes-modules-2.6.18-4-iop32x-di
-loop-aes-modules-2.6.18-4-ixp4xx-di
-loop-aes-modules-2.6.18-4-rpc-di
-loop-aes-modules-2.6.18-5-footbridge-di
-loop-aes-modules-2.6.18-5-iop32x-di
-loop-aes-modules-2.6.18-5-ixp4xx-di
-loop-aes-modules-2.6.18-5-rpc-di
-loop-modules-2.6.18-4-footbridge-di
-loop-modules-2.6.18-4-iop32x-di
-loop-modules-2.6.18-4-ixp4xx-di
-loop-modules-2.6.18-4-rpc-di
-loop-modules-2.6.18-5-footbridge-di
-loop-modules-2.6.18-5-iop32x-di
-loop-modules-2.6.18-5-ixp4xx-di
-loop-modules-2.6.18-5-rpc-di
+loop-aes-modules-2.6.18-6-footbridge-di
+loop-aes-modules-2.6.18-6-iop32x-di
+loop-aes-modules-2.6.18-6-ixp4xx-di
+loop-aes-modules-2.6.18-6-rpc-di
+loop-modules-2.6.18-6-footbridge-di
+loop-modules-2.6.18-6-iop32x-di
+loop-modules-2.6.18-6-ixp4xx-di
+loop-modules-2.6.18-6-rpc-di
 lowmem
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.6.18-4-footbridge-di
-md-modules-2.6.18-4-iop32x-di
-md-modules-2.6.18-4-ixp4xx-di
-md-modules-2.6.18-5-footbridge-di
-md-modules-2.6.18-5-iop32x-di
-md-modules-2.6.18-5-ixp4xx-di
+md-modules-2.6.18-6-footbridge-di
+md-modules-2.6.18-6-iop32x-di
+md-modules-2.6.18-6-ixp4xx-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
@@ -314,18 +257,12 @@ net-retriever
 netcfg
 network-console
 network-preseed
-nic-modules-2.6.18-4-footbridge-di
-nic-modules-2.6.18-4-iop32x-di
-nic-modules-2.6.18-4-ixp4xx-di
-nic-modules-2.6.18-5-footbridge-di
-nic-modules-2.6.18-5-iop32x-di
-nic-modules-2.6.18-5-ixp4xx-di
-nic-shared-modules-2.6.18-4-footbridge-di
-nic-shared-modules-2.6.18-5-footbridge-di
-nic-usb-modules-2.6.18-4-iop32x-di
-nic-usb-modules-2.6.18-4-ixp4xx-di
-nic-usb-modules-2.6.18-5-iop32x-di
-nic-usb-modules-2.6.18-5-ixp4xx-di
+nic-modules-2.6.18-6-footbridge-di
+nic-modules-2.6.18-6-iop32x-di
+nic-modules-2.6.18-6-ixp4xx-di
+nic-shared-modules-2.6.18-6-footbridge-di
+nic-usb-modules-2.6.18-6-iop32x-di
+nic-usb-modules-2.6.18-6-ixp4xx-di
 nobootloader
 ntfsprogs-udeb
 oldsys-preseed
@@ -362,40 +299,25 @@ pcmciautils-udeb
 pkgsel
 ppp-udeb
 pwgen-udeb
-reiserfs-modules-2.6.18-4-footbridge-di
-reiserfs-modules-2.6.18-4-iop32x-di
-reiserfs-modules-2.6.18-4-ixp4xx-di
-reiserfs-modules-2.6.18-4-rpc-di
-reiserfs-modules-2.6.18-5-footbridge-di
-reiserfs-modules-2.6.18-5-iop32x-di
-reiserfs-modules-2.6.18-5-ixp4xx-di
-reiserfs-modules-2.6.18-5-rpc-di
+reiserfs-modules-2.6.18-6-footbridge-di
+reiserfs-modules-2.6.18-6-iop32x-di
+reiserfs-modules-2.6.18-6-ixp4xx-di
+reiserfs-modules-2.6.18-6-rpc-di
 rescue-mode
-sata-modules-2.6.18-4-iop32x-di
-sata-modules-2.6.18-5-iop32x-di
+sata-modules-2.6.18-6-iop32x-di
 save-logs
-scsi-core-modules-2.6.18-4-footbridge-di
-scsi-core-modules-2.6.18-4-iop32x-di
-scsi-core-modules-2.6.18-4-ixp4xx-di
-scsi-core-modules-2.6.18-4-rpc-di
-scsi-core-modules-2.6.18-5-footbridge-di
-scsi-core-modules-2.6.18-5-iop32x-di
-scsi-core-modules-2.6.18-5-ixp4xx-di
-scsi-core-modules-2.6.18-5-rpc-di
+scsi-core-modules-2.6.18-6-footbridge-di
+scsi-core-modules-2.6.18-6-iop32x-di
+scsi-core-modules-2.6.18-6-ixp4xx-di
+scsi-core-modules-2.6.18-6-rpc-di
 strace-udeb
 tzsetup-udeb
-usb-modules-2.6.18-4-footbridge-di
-usb-modules-2.6.18-4-iop32x-di
-usb-modules-2.6.18-4-ixp4xx-di
-usb-modules-2.6.18-5-footbridge-di
-usb-modules-2.6.18-5-iop32x-di
-usb-modules-2.6.18-5-ixp4xx-di
-usb-storage-modules-2.6.18-4-footbridge-di
-usb-storage-modules-2.6.18-4-iop32x-di
-usb-storage-modules-2.6.18-4-ixp4xx-di
-usb-storage-modules-2.6.18-5-footbridge-di
-usb-storage-modules-2.6.18-5-iop32x-di
-usb-storage-modules-2.6.18-5-ixp4xx-di
+usb-modules-2.6.18-6-footbridge-di
+usb-modules-2.6.18-6-iop32x-di
+usb-modules-2.6.18-6-ixp4xx-di
+usb-storage-modules-2.6.18-6-footbridge-di
+usb-storage-modules-2.6.18-6-iop32x-di
+usb-storage-modules-2.6.18-6-ixp4xx-di
 usbutils-udeb
 user-setup-udeb
 userdevfs
@@ -412,10 +334,8 @@ base-installer
 beep-udeb
 bterm-unifont
 cdebconf-newt-entropy
-cdrom-core-modules-2.6.18-4-parisc-di
-cdrom-core-modules-2.6.18-4-parisc64-di
-cdrom-core-modules-2.6.18-5-parisc-di
-cdrom-core-modules-2.6.18-5-parisc64-di
+cdrom-core-modules-2.6.18-6-parisc-di
+cdrom-core-modules-2.6.18-6-parisc64-di
 cfdisk-udeb
 choose-mirror
 choose-mirror-bin
@@ -428,10 +348,8 @@ console-keymaps-dec
 console-keymaps-mac
 console-keymaps-sun
 console-keymaps-usb
-crypto-modules-2.6.18-4-parisc-di
-crypto-modules-2.6.18-4-parisc64-di
-crypto-modules-2.6.18-5-parisc-di
-crypto-modules-2.6.18-5-parisc64-di
+crypto-modules-2.6.18-6-parisc-di
+crypto-modules-2.6.18-6-parisc64-di
 cryptsetup-udeb
 debian-archive-keyring-udeb
 debootstrap-udeb
@@ -445,27 +363,19 @@ dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
-ext3-modules-2.6.18-4-parisc-di
-ext3-modules-2.6.18-4-parisc64-di
-ext3-modules-2.6.18-5-parisc-di
-ext3-modules-2.6.18-5-parisc64-di
+ext3-modules-2.6.18-6-parisc-di
+ext3-modules-2.6.18-6-parisc64-di
 fdisk-udeb
 finish-install
 gnupg-udeb
 gpgv-udeb
 gtk2-engines-udeb
-ide-modules-2.6.18-4-parisc-di
-ide-modules-2.6.18-4-parisc64-di
-ide-modules-2.6.18-5-parisc-di
-ide-modules-2.6.18-5-parisc64-di
-input-modules-2.6.18-4-parisc-di
-input-modules-2.6.18-4-parisc64-di
-input-modules-2.6.18-5-parisc-di
-input-modules-2.6.18-5-parisc64-di
-ipv6-modules-2.6.18-4-parisc-di
-ipv6-modules-2.6.18-4-parisc64-di
-ipv6-modules-2.6.18-5-parisc-di
-ipv6-modules-2.6.18-5-parisc64-di
+ide-modules-2.6.18-6-parisc-di
+ide-modules-2.6.18-6-parisc64-di
+input-modules-2.6.18-6-parisc-di
+input-modules-2.6.18-6-parisc64-di
+ipv6-modules-2.6.18-6-parisc-di
+ipv6-modules-2.6.18-6-parisc64-di
 jfsutils-udeb
 kbd-chooser
 klibc-utils-floppy-udeb
@@ -484,22 +394,16 @@ libsysfs2-udeb
 libtextwrap1-udeb
 libusb-0.1-udeb
 libuuid1-udeb
-loop-aes-modules-2.6.18-4-parisc-di
-loop-aes-modules-2.6.18-4-parisc64-di
-loop-aes-modules-2.6.18-5-parisc-di
-loop-aes-modules-2.6.18-5-parisc64-di
-loop-modules-2.6.18-4-parisc-di
-loop-modules-2.6.18-4-parisc64-di
-loop-modules-2.6.18-5-parisc-di
-loop-modules-2.6.18-5-parisc64-di
+loop-aes-modules-2.6.18-6-parisc-di
+loop-aes-modules-2.6.18-6-parisc64-di
+loop-modules-2.6.18-6-parisc-di
+loop-modules-2.6.18-6-parisc64-di
 lowmem
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.6.18-4-parisc-di
-md-modules-2.6.18-4-parisc64-di
-md-modules-2.6.18-5-parisc-di
-md-modules-2.6.18-5-parisc64-di
+md-modules-2.6.18-6-parisc-di
+md-modules-2.6.18-6-parisc64-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
@@ -511,10 +415,8 @@ net-retriever
 netcfg
 network-console
 network-preseed
-nic-modules-2.6.18-4-parisc-di
-nic-modules-2.6.18-4-parisc64-di
-nic-modules-2.6.18-5-parisc-di
-nic-modules-2.6.18-5-parisc64-di
+nic-modules-2.6.18-6-parisc-di
+nic-modules-2.6.18-6-parisc64-di
 nobootloader
 ntfsprogs-udeb
 oldsys-preseed
@@ -548,28 +450,20 @@ pciutils-udeb
 pcmcia-cs-udeb
 pcmciautils-udeb
 pkgsel
-ppp-modules-2.6.18-4-parisc-di
-ppp-modules-2.6.18-4-parisc64-di
-ppp-modules-2.6.18-5-parisc-di
-ppp-modules-2.6.18-5-parisc64-di
+ppp-modules-2.6.18-6-parisc-di
+ppp-modules-2.6.18-6-parisc64-di
 ppp-udeb
 pwgen-udeb
 rescue-mode
 save-logs
-scsi-modules-2.6.18-4-parisc-di
-scsi-modules-2.6.18-4-parisc64-di
-scsi-modules-2.6.18-5-parisc-di
-scsi-modules-2.6.18-5-parisc64-di
+scsi-modules-2.6.18-6-parisc-di
+scsi-modules-2.6.18-6-parisc64-di
 strace-udeb
 tzsetup-udeb
-usb-modules-2.6.18-4-parisc-di
-usb-modules-2.6.18-4-parisc64-di
-usb-modules-2.6.18-5-parisc-di
-usb-modules-2.6.18-5-parisc64-di
-usb-storage-modules-2.6.18-4-parisc-di
-usb-storage-modules-2.6.18-4-parisc64-di
-usb-storage-modules-2.6.18-5-parisc-di
-usb-storage-modules-2.6.18-5-parisc64-di
+usb-modules-2.6.18-6-parisc-di
+usb-modules-2.6.18-6-parisc64-di
+usb-storage-modules-2.6.18-6-parisc-di
+usb-storage-modules-2.6.18-6-parisc64-di
 usbutils-udeb
 user-setup-udeb
 userdevfs
@@ -578,8 +472,7 @@ xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_hppa */
 #ifdef ARCH_i386
-acpi-modules-2.6.18-4-486-di
-acpi-modules-2.6.18-5-486-di
+acpi-modules-2.6.18-6-486-di
 apt-cdrom-setup
 apt-mirror-setup
 apt-setup-udeb
@@ -598,10 +491,8 @@ console-keymaps-atari
 console-keymaps-dec
 console-keymaps-mac
 console-keymaps-sun
-crc-modules-2.6.18-4-486-di
-crc-modules-2.6.18-5-486-di
-crypto-modules-2.6.18-4-486-di
-crypto-modules-2.6.18-5-486-di
+crc-modules-2.6.18-6-486-di
+crypto-modules-2.6.18-6-486-di
 cryptsetup-udeb
 debian-archive-keyring-udeb
 debootstrap-udeb
@@ -614,31 +505,23 @@ dmidecode-udeb
 dmraid-udeb
 dmsetup-udeb
 e2fsprogs-udeb
-efi-modules-2.6.18-4-486-di
-efi-modules-2.6.18-5-486-di
+efi-modules-2.6.18-6-486-di
 eject-udeb
 elilo-installer
 ethdetect
-ext3-modules-2.6.18-4-486-di
-ext3-modules-2.6.18-5-486-di
-fat-modules-2.6.18-4-486-di
-fat-modules-2.6.18-5-486-di
+ext3-modules-2.6.18-6-486-di
+fat-modules-2.6.18-6-486-di
 fdisk-udeb
 finish-install
-firewire-core-modules-2.6.18-4-486-di
-firewire-core-modules-2.6.18-5-486-di
-firmware-modules-2.6.18-4-486-di
-firmware-modules-2.6.18-5-486-di
+firewire-core-modules-2.6.18-6-486-di
+firmware-modules-2.6.18-6-486-di
 gnupg-udeb
 gpgv-udeb
 grub-installer
 gtk2-engines-udeb
-ipv6-modules-2.6.18-4-486-di
-ipv6-modules-2.6.18-5-486-di
-irda-modules-2.6.18-4-486-di
-irda-modules-2.6.18-5-486-di
-jfs-modules-2.6.18-4-486-di
-jfs-modules-2.6.18-5-486-di
+ipv6-modules-2.6.18-6-486-di
+irda-modules-2.6.18-6-486-di
+jfs-modules-2.6.18-6-486-di
 jfsutils-udeb
 klibc-utils-floppy-udeb
 libblkid1-udeb
@@ -657,15 +540,12 @@ libtextwrap1-udeb
 libusb-0.1-udeb
 libuuid1-udeb
 lilo-installer
-loop-aes-modules-2.6.18-4-486-di
-loop-aes-modules-2.6.18-5-486-di
-loop-modules-2.6.18-4-486-di
-loop-modules-2.6.18-5-486-di
+loop-aes-modules-2.6.18-6-486-di
+loop-modules-2.6.18-6-486-di
 lowmem
 lvm2-udeb
 lvmcfg-utils
-md-modules-2.6.18-4-486-di
-md-modules-2.6.18-5-486-di
+md-modules-2.6.18-6-486-di
 mdadm-udeb
 mdcfg-utils
 mii-diag-udeb
@@ -676,26 +556,19 @@ net-retriever
 netcfg
 network-console
 network-preseed
-nic-extra-modules-2.6.18-4-486-di
-nic-extra-modules-2.6.18-5-486-di
-nic-modules-2.6.18-4-486-di
-nic-modules-2.6.18-5-486-di
-nic-pcmcia-modules-2.6.18-4-486-di
-nic-pcmcia-modules-2.6.18-5-486-di
-nic-shared-modules-2.6.18-4-486-di
-nic-shared-modules-2.6.18-5-486-di
-nic-usb-modules-2.6.18-4-486-di
-nic-usb-modules-2.6.18-5-486-di
+nic-extra-modules-2.6.18-6-486-di
+nic-modules-2.6.18-6-486-di
+nic-pcmcia-modules-2.6.18-6-486-di
+nic-shared-modules-2.6.18-6-486-di
+nic-usb-modules-2.6.18-6-486-di
 nobootloader
-ntfs-modules-2.6.18-4-486-di
-ntfs-modules-2.6.18-5-486-di
+ntfs-modules-2.6.18-6-486-di
 ntfsprogs-udeb
 oldsys-preseed
 openssh-client-udeb
 openssh-server-udeb
 os-prober-udeb
-parport-modules-2.6.18-4-486-di
-parport-modules-2.6.18-5-486-di
+parport-modules-2.6.18-6-486-di
 partconf-find-partitions
 parted-udeb
 partman-auto
@@ -719,51 +592,36 @@ partman-target
 partman-xfs
 pciutils-udeb
 pcmcia-cs-udeb
-pcmcia-modules-2.6.18-4-486-di
-pcmcia-modules-2.6.18-5-486-di
-pcmcia-storage-modules-2.6.18-4-486-di
-pcmcia-storage-modules-2.6.18-5-486-di
+pcmcia-modules-2.6.18-6-486-di
+pcmcia-storage-modules-2.6.18-6-486-di
 pcmciautils-udeb
 pkgsel
-plip-modules-2.6.18-4-486-di
-plip-modules-2.6.18-5-486-di
-ppp-modules-2.6.18-4-486-di
-ppp-modules-2.6.18-5-486-di
+plip-modules-2.6.18-6-486-di
+ppp-modules-2.6.18-6-486-di
 ppp-udeb
 pwgen-udeb
-qnx4-modules-2.6.18-4-486-di
-qnx4-modules-2.6.18-5-486-di
-reiserfs-modules-2.6.18-4-486-di
-reiserfs-modules-2.6.18-5-486-di
+qnx4-modules-2.6.18-6-486-di
+reiserfs-modules-2.6.18-6-486-di
 rescue-mode
-sata-modules-2.6.18-4-486-di
-sata-modules-2.6.18-5-486-di
+sata-modules-2.6.18-6-486-di
 save-logs
-scsi-common-modules-2.6.18-4-486-di
-scsi-common-modules-2.6.18-5-486-di
-scsi-extra-modules-2.6.18-4-486-di
-scsi-extra-modules-2.6.18-5-486-di
-scsi-modules-2.6.18-4-486-di
-scsi-modules-2.6.18-5-486-di
-serial-modules-2.6.18-4-486-di
-serial-modules-2.6.18-5-486-di
+scsi-common-modules-2.6.18-6-486-di
+scsi-extra-modules-2.6.18-6-486-di
+scsi-modules-2.6.18-6-486-di
+serial-modules-2.6.18-6-486-di
 strace-udeb
 tzsetup-udeb
-ufs-modules-2.6.18-4-486-di
-ufs-modules-2.6.18-5-486-di
-usb-serial-modules-2.6.18-4-486-di
-usb-serial-modules-2.6.18-5-486-di
+ufs-modules-2.6.18-6-486-di
+usb-serial-modules-2.6.18-6-486-di
 usbutils-udeb
 user-setup-udeb
 wireless-tools-udeb
-xfs-modules-2.6.18-4-486-di
-xfs-modules-2.6.18-5-486-di
+xfs-modules-2.6.18-6-486-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_i386 */
 #ifdef ARCH_ia64
-acpi-modules-2.6.18-4-itanium-di
-acpi-modules-2.6.18-5-itanium-di
+acpi-modules-2.6.18-6-itanium-di
 apt-cdrom-setup
 apt-mirror-setup
 apt-setup-udeb
@@ -772,8 +630,7 @@ base-installer
 beep-udeb
 bterm-unifont
 cdebconf-newt-entropy
-cdrom-core-modules-2.6.18-4-itanium-di
-cdrom-core-modules-2.6.18-5-itanium-di
+cdrom-core-modules-2.6.18-6-itanium-di
 cfdisk-udeb
 choose-mirror
 choose-mirror-bin
@@ -786,10 +643,8 @@ console-keymaps-dec
 console-keymaps-mac
 console-keymaps-sun
 console-keymaps-usb
-crc-modules-2.6.18-4-itanium-di
-crc-modules-2.6.18-5-itanium-di
-crypto-modules-2.6.18-4-itanium-di
-crypto-modules-2.6.18-5-itanium-di
+crc-modules-2.6.18-6-itanium-di
+crypto-modules-2.6.18-6-itanium-di
 cryptsetup-udeb
 debian-archive-keyring-udeb
 debootstrap-udeb
@@ -802,39 +657,27 @@ dmidecode-udeb
 dmraid-udeb
 dmsetup-udeb
 e2fsprogs-udeb
-efi-modules-2.6.18-4-itanium-di
-efi-modules-2.6.18-5-itanium-di
+efi-modules-2.6.18-6-itanium-di
 efi-reader
 eject-udeb
 elilo-installer
 ethdetect
-ext3-modules-2.6.18-4-itanium-di
-ext3-modules-2.6.18-5-itanium-di
-fat-modules-2.6.18-4-itanium-di
-fat-modules-2.6.18-5-itanium-di
-fb-modules-2.6.18-4-itanium-di
-fb-modules-2.6.18-5-itanium-di
+ext3-modules-2.6.18-6-itanium-di
+fat-modules-2.6.18-6-itanium-di
+fb-modules-2.6.18-6-itanium-di
 fdisk-udeb
 finish-install
-firewire-core-modules-2.6.18-4-itanium-di
-firewire-core-modules-2.6.18-5-itanium-di
-firmware-modules-2.6.18-4-itanium-di
-firmware-modules-2.6.18-5-itanium-di
+firewire-core-modules-2.6.18-6-itanium-di
+firmware-modules-2.6.18-6-itanium-di
 gnupg-udeb
 gpgv-udeb
 gtk2-engines-udeb
-ide-core-modules-2.6.18-4-itanium-di
-ide-core-modules-2.6.18-5-itanium-di
-ide-modules-2.6.18-4-itanium-di
-ide-modules-2.6.18-5-itanium-di
-input-modules-2.6.18-4-itanium-di
-input-modules-2.6.18-5-itanium-di
-ipv6-modules-2.6.18-4-itanium-di
-ipv6-modules-2.6.18-5-itanium-di
-irda-modules-2.6.18-4-itanium-di
-irda-modules-2.6.18-5-itanium-di
-jfs-modules-2.6.18-4-itanium-di
-jfs-modules-2.6.18-5-itanium-di
+ide-core-modules-2.6.18-6-itanium-di
+ide-modules-2.6.18-6-itanium-di
+input-modules-2.6.18-6-itanium-di
+ipv6-modules-2.6.18-6-itanium-di
+irda-modules-2.6.18-6-itanium-di
+jfs-modules-2.6.18-6-itanium-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
@@ -852,16 +695,13 @@ libsysfs2-udeb
 libtextwrap1-udeb
 libusb-0.1-udeb
 libuuid1-udeb
-loop-aes-modules-2.6.18-4-itanium-di
-loop-aes-modules-2.6.18-5-itanium-di
-loop-modules-2.6.18-4-itanium-di
-loop-modules-2.6.18-5-itanium-di
+loop-aes-modules-2.6.18-6-itanium-di
+loop-modules-2.6.18-6-itanium-di
 lowmem
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.6.18-4-itanium-di
-md-modules-2.6.18-5-itanium-di
+md-modules-2.6.18-6-itanium-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
@@ -873,22 +713,17 @@ net-retriever
 netcfg
 network-console
 network-preseed
-nic-modules-2.6.18-4-itanium-di
-nic-modules-2.6.18-5-itanium-di
-nic-shared-modules-2.6.18-4-itanium-di
-nic-shared-modules-2.6.18-5-itanium-di
-nic-usb-modules-2.6.18-4-itanium-di
-nic-usb-modules-2.6.18-5-itanium-di
+nic-modules-2.6.18-6-itanium-di
+nic-shared-modules-2.6.18-6-itanium-di
+nic-usb-modules-2.6.18-6-itanium-di
 nobootloader
-ntfs-modules-2.6.18-4-itanium-di
-ntfs-modules-2.6.18-5-itanium-di
+ntfs-modules-2.6.18-6-itanium-di
 ntfsprogs-udeb
 oldsys-preseed
 openssh-client-udeb
 openssh-server-udeb
 os-prober-udeb
-parport-modules-2.6.18-4-itanium-di
-parport-modules-2.6.18-5-itanium-di
+parport-modules-2.6.18-6-itanium-di
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
@@ -913,46 +748,32 @@ partman-target
 partman-xfs
 pciutils-udeb
 pcmcia-cs-udeb
-pcmcia-modules-2.6.18-4-itanium-di
-pcmcia-modules-2.6.18-5-itanium-di
+pcmcia-modules-2.6.18-6-itanium-di
 pcmciautils-udeb
 pkgsel
-plip-modules-2.6.18-4-itanium-di
-plip-modules-2.6.18-5-itanium-di
-ppp-modules-2.6.18-4-itanium-di
-ppp-modules-2.6.18-5-itanium-di
+plip-modules-2.6.18-6-itanium-di
+ppp-modules-2.6.18-6-itanium-di
 ppp-udeb
 pwgen-udeb
-reiserfs-modules-2.6.18-4-itanium-di
-reiserfs-modules-2.6.18-5-itanium-di
+reiserfs-modules-2.6.18-6-itanium-di
 rescue-mode
-sata-modules-2.6.18-4-itanium-di
-sata-modules-2.6.18-5-itanium-di
+sata-modules-2.6.18-6-itanium-di
 save-logs
-scsi-common-modules-2.6.18-4-itanium-di
-scsi-common-modules-2.6.18-5-itanium-di
-scsi-core-modules-2.6.18-4-itanium-di
-scsi-core-modules-2.6.18-5-itanium-di
-scsi-modules-2.6.18-4-itanium-di
-scsi-modules-2.6.18-5-itanium-di
-serial-modules-2.6.18-4-itanium-di
-serial-modules-2.6.18-5-itanium-di
-sn-modules-2.6.18-4-itanium-di
-sn-modules-2.6.18-5-itanium-di
+scsi-common-modules-2.6.18-6-itanium-di
+scsi-core-modules-2.6.18-6-itanium-di
+scsi-modules-2.6.18-6-itanium-di
+serial-modules-2.6.18-6-itanium-di
+sn-modules-2.6.18-6-itanium-di
 strace-udeb
 tzsetup-udeb
-ufs-modules-2.6.18-4-itanium-di
-ufs-modules-2.6.18-5-itanium-di
-usb-modules-2.6.18-4-itanium-di
-usb-modules-2.6.18-5-itanium-di
-usb-storage-modules-2.6.18-4-itanium-di
-usb-storage-modules-2.6.18-5-itanium-di
+ufs-modules-2.6.18-6-itanium-di
+usb-modules-2.6.18-6-itanium-di
+usb-storage-modules-2.6.18-6-itanium-di
 usbutils-udeb
 user-setup-udeb
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.6.18-4-itanium-di
-xfs-modules-2.6.18-5-itanium-di
+xfs-modules-2.6.18-6-itanium-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_ia64 */
@@ -966,10 +787,8 @@ base-installer
 beep-udeb
 bterm-unifont
 cdebconf-newt-entropy
-cdrom-core-modules-2.6.18-4-sb1-bcm91250a-di
-cdrom-core-modules-2.6.18-4-sb1a-bcm91480b-di
-cdrom-core-modules-2.6.18-5-sb1-bcm91250a-di
-cdrom-core-modules-2.6.18-5-sb1a-bcm91480b-di
+cdrom-core-modules-2.6.18-6-sb1-bcm91250a-di
+cdrom-core-modules-2.6.18-6-sb1a-bcm91480b-di
 cfdisk-udeb
 choose-mirror
 choose-mirror-bin
@@ -982,14 +801,10 @@ console-keymaps-dec
 console-keymaps-mac
 console-keymaps-sun
 console-keymaps-usb
-crypto-modules-2.6.18-4-r4k-ip22-di
-crypto-modules-2.6.18-4-r5k-ip32-di
-crypto-modules-2.6.18-4-sb1-bcm91250a-di
-crypto-modules-2.6.18-4-sb1a-bcm91480b-di
-crypto-modules-2.6.18-5-r4k-ip22-di
-crypto-modules-2.6.18-5-r5k-ip32-di
-crypto-modules-2.6.18-5-sb1-bcm91250a-di
-crypto-modules-2.6.18-5-sb1a-bcm91480b-di
+crypto-modules-2.6.18-6-r4k-ip22-di
+crypto-modules-2.6.18-6-r5k-ip32-di
+crypto-modules-2.6.18-6-sb1-bcm91250a-di
+crypto-modules-2.6.18-6-sb1a-bcm91480b-di
 cryptsetup-udeb
 debian-archive-keyring-udeb
 debootstrap-udeb
@@ -1003,47 +818,29 @@ dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
-fat-modules-2.6.18-4-qemu-di
-fat-modules-2.6.18-4-sb1-bcm91250a-di
-fat-modules-2.6.18-4-sb1a-bcm91480b-di
-fat-modules-2.6.18-5-qemu-di
-fat-modules-2.6.18-5-sb1-bcm91250a-di
-fat-modules-2.6.18-5-sb1a-bcm91480b-di
-fb-modules-2.6.18-4-sb1-bcm91250a-di
-fb-modules-2.6.18-4-sb1a-bcm91480b-di
-fb-modules-2.6.18-5-sb1-bcm91250a-di
-fb-modules-2.6.18-5-sb1a-bcm91480b-di
+fat-modules-2.6.18-6-qemu-di
+fat-modules-2.6.18-6-sb1-bcm91250a-di
+fat-modules-2.6.18-6-sb1a-bcm91480b-di
+fb-modules-2.6.18-6-sb1-bcm91250a-di
+fb-modules-2.6.18-6-sb1a-bcm91480b-di
 fdisk-udeb
 finish-install
 gnupg-udeb
 gpgv-udeb
 gtk2-engines-udeb
-ide-modules-2.6.18-4-sb1-bcm91250a-di
-ide-modules-2.6.18-4-sb1a-bcm91480b-di
-ide-modules-2.6.18-5-sb1-bcm91250a-di
-ide-modules-2.6.18-5-sb1a-bcm91480b-di
-input-modules-2.6.18-4-sb1-bcm91250a-di
-input-modules-2.6.18-4-sb1a-bcm91480b-di
-input-modules-2.6.18-5-sb1-bcm91250a-di
-input-modules-2.6.18-5-sb1a-bcm91480b-di
-ipv6-modules-2.6.18-4-r4k-ip22-di
-ipv6-modules-2.6.18-4-r5k-ip32-di
-ipv6-modules-2.6.18-4-sb1-bcm91250a-di
-ipv6-modules-2.6.18-4-sb1a-bcm91480b-di
-ipv6-modules-2.6.18-5-r4k-ip22-di
-ipv6-modules-2.6.18-5-r5k-ip32-di
-ipv6-modules-2.6.18-5-sb1-bcm91250a-di
-ipv6-modules-2.6.18-5-sb1a-bcm91480b-di
-jfs-modules-2.6.18-4-qemu-di
-jfs-modules-2.6.18-4-r4k-ip22-di
-jfs-modules-2.6.18-4-r5k-ip32-di
-jfs-modules-2.6.18-4-sb1-bcm91250a-di
-jfs-modules-2.6.18-4-sb1a-bcm91480b-di
-jfs-modules-2.6.18-5-qemu-di
-jfs-modules-2.6.18-5-r4k-ip22-di
-jfs-modules-2.6.18-5-r5k-ip32-di
-jfs-modules-2.6.18-5-sb1-bcm91250a-di
-jfs-modules-2.6.18-5-sb1a-bcm91480b-di
+ide-modules-2.6.18-6-sb1-bcm91250a-di
+ide-modules-2.6.18-6-sb1a-bcm91480b-di
+input-modules-2.6.18-6-sb1-bcm91250a-di
+input-modules-2.6.18-6-sb1a-bcm91480b-di
+ipv6-modules-2.6.18-6-r4k-ip22-di
+ipv6-modules-2.6.18-6-r5k-ip32-di
+ipv6-modules-2.6.18-6-sb1-bcm91250a-di
+ipv6-modules-2.6.18-6-sb1a-bcm91480b-di
+jfs-modules-2.6.18-6-qemu-di
+jfs-modules-2.6.18-6-r4k-ip22-di
+jfs-modules-2.6.18-6-r5k-ip32-di
+jfs-modules-2.6.18-6-sb1-bcm91250a-di
+jfs-modules-2.6.18-6-sb1a-bcm91480b-di
 jfsutils-udeb
 kbd-chooser
 klibc-utils-floppy-udeb
@@ -1062,40 +859,25 @@ libsysfs2-udeb
 libtextwrap1-udeb
 libusb-0.1-udeb
 libuuid1-udeb
-loop-aes-modules-2.6.18-4-qemu-di
-loop-aes-modules-2.6.18-4-r4k-ip22-di
-loop-aes-modules-2.6.18-4-r5k-ip32-di
-loop-aes-modules-2.6.18-4-sb1-bcm91250a-di
-loop-aes-modules-2.6.18-4-sb1a-bcm91480b-di
-loop-aes-modules-2.6.18-5-qemu-di
-loop-aes-modules-2.6.18-5-r4k-ip22-di
-loop-aes-modules-2.6.18-5-r5k-ip32-di
-loop-aes-modules-2.6.18-5-sb1-bcm91250a-di
-loop-aes-modules-2.6.18-5-sb1a-bcm91480b-di
-loop-modules-2.6.18-4-qemu-di
-loop-modules-2.6.18-4-r4k-ip22-di
-loop-modules-2.6.18-4-r5k-ip32-di
-loop-modules-2.6.18-4-sb1-bcm91250a-di
-loop-modules-2.6.18-4-sb1a-bcm91480b-di
-loop-modules-2.6.18-5-qemu-di
-loop-modules-2.6.18-5-r4k-ip22-di
-loop-modules-2.6.18-5-r5k-ip32-di
-loop-modules-2.6.18-5-sb1-bcm91250a-di
-loop-modules-2.6.18-5-sb1a-bcm91480b-di
+loop-aes-modules-2.6.18-6-qemu-di
+loop-aes-modules-2.6.18-6-r4k-ip22-di
+loop-aes-modules-2.6.18-6-r5k-ip32-di
+loop-aes-modules-2.6.18-6-sb1-bcm91250a-di
+loop-aes-modules-2.6.18-6-sb1a-bcm91480b-di
+loop-modules-2.6.18-6-qemu-di
+loop-modules-2.6.18-6-r4k-ip22-di
+loop-modules-2.6.18-6-r5k-ip32-di
+loop-modules-2.6.18-6-sb1-bcm91250a-di
+loop-modules-2.6.18-6-sb1a-bcm91480b-di
 lowmem
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.6.18-4-qemu-di
-md-modules-2.6.18-4-r4k-ip22-di
-md-modules-2.6.18-4-r5k-ip32-di
-md-modules-2.6.18-4-sb1-bcm91250a-di
-md-modules-2.6.18-4-sb1a-bcm91480b-di
-md-modules-2.6.18-5-qemu-di
-md-modules-2.6.18-5-r4k-ip22-di
-md-modules-2.6.18-5-r5k-ip32-di
-md-modules-2.6.18-5-sb1-bcm91250a-di
-md-modules-2.6.18-5-sb1a-bcm91480b-di
+md-modules-2.6.18-6-qemu-di
+md-modules-2.6.18-6-r4k-ip22-di
+md-modules-2.6.18-6-r5k-ip32-di
+md-modules-2.6.18-6-sb1-bcm91250a-di
+md-modules-2.6.18-6-sb1a-bcm91480b-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
@@ -1140,69 +922,43 @@ pciutils-udeb
 pcmcia-cs-udeb
 pcmciautils-udeb
 pkgsel
-ppp-modules-2.6.18-4-r4k-ip22-di
-ppp-modules-2.6.18-4-r5k-ip32-di
-ppp-modules-2.6.18-4-sb1-bcm91250a-di
-ppp-modules-2.6.18-4-sb1a-bcm91480b-di
-ppp-modules-2.6.18-5-r4k-ip22-di
-ppp-modules-2.6.18-5-r5k-ip32-di
-ppp-modules-2.6.18-5-sb1-bcm91250a-di
-ppp-modules-2.6.18-5-sb1a-bcm91480b-di
+ppp-modules-2.6.18-6-r4k-ip22-di
+ppp-modules-2.6.18-6-r5k-ip32-di
+ppp-modules-2.6.18-6-sb1-bcm91250a-di
+ppp-modules-2.6.18-6-sb1a-bcm91480b-di
 ppp-udeb
 pwgen-udeb
-reiserfs-modules-2.6.18-4-qemu-di
-reiserfs-modules-2.6.18-4-r4k-ip22-di
-reiserfs-modules-2.6.18-4-r5k-ip32-di
-reiserfs-modules-2.6.18-4-sb1-bcm91250a-di
-reiserfs-modules-2.6.18-4-sb1a-bcm91480b-di
-reiserfs-modules-2.6.18-5-qemu-di
-reiserfs-modules-2.6.18-5-r4k-ip22-di
-reiserfs-modules-2.6.18-5-r5k-ip32-di
-reiserfs-modules-2.6.18-5-sb1-bcm91250a-di
-reiserfs-modules-2.6.18-5-sb1a-bcm91480b-di
+reiserfs-modules-2.6.18-6-qemu-di
+reiserfs-modules-2.6.18-6-r4k-ip22-di
+reiserfs-modules-2.6.18-6-r5k-ip32-di
+reiserfs-modules-2.6.18-6-sb1-bcm91250a-di
+reiserfs-modules-2.6.18-6-sb1a-bcm91480b-di
 rescue-mode
-sata-modules-2.6.18-4-sb1-bcm91250a-di
-sata-modules-2.6.18-4-sb1a-bcm91480b-di
-sata-modules-2.6.18-5-sb1-bcm91250a-di
-sata-modules-2.6.18-5-sb1a-bcm91480b-di
+sata-modules-2.6.18-6-sb1-bcm91250a-di
+sata-modules-2.6.18-6-sb1a-bcm91480b-di
 save-logs
-scsi-common-modules-2.6.18-4-sb1-bcm91250a-di
-scsi-common-modules-2.6.18-4-sb1a-bcm91480b-di
-scsi-common-modules-2.6.18-5-sb1-bcm91250a-di
-scsi-common-modules-2.6.18-5-sb1a-bcm91480b-di
-scsi-core-modules-2.6.18-4-sb1-bcm91250a-di
-scsi-core-modules-2.6.18-4-sb1a-bcm91480b-di
-scsi-core-modules-2.6.18-5-sb1-bcm91250a-di
-scsi-core-modules-2.6.18-5-sb1a-bcm91480b-di
-scsi-modules-2.6.18-4-sb1-bcm91250a-di
-scsi-modules-2.6.18-4-sb1a-bcm91480b-di
-scsi-modules-2.6.18-5-sb1-bcm91250a-di
-scsi-modules-2.6.18-5-sb1a-bcm91480b-di
+scsi-common-modules-2.6.18-6-sb1-bcm91250a-di
+scsi-common-modules-2.6.18-6-sb1a-bcm91480b-di
+scsi-core-modules-2.6.18-6-sb1-bcm91250a-di
+scsi-core-modules-2.6.18-6-sb1a-bcm91480b-di
+scsi-modules-2.6.18-6-sb1-bcm91250a-di
+scsi-modules-2.6.18-6-sb1a-bcm91480b-di
 sibyl-installer
 strace-udeb
 tzsetup-udeb
-usb-modules-2.6.18-4-sb1-bcm91250a-di
-usb-modules-2.6.18-4-sb1a-bcm91480b-di
-usb-modules-2.6.18-5-sb1-bcm91250a-di
-usb-modules-2.6.18-5-sb1a-bcm91480b-di
-usb-storage-modules-2.6.18-4-sb1-bcm91250a-di
-usb-storage-modules-2.6.18-4-sb1a-bcm91480b-di
-usb-storage-modules-2.6.18-5-sb1-bcm91250a-di
-usb-storage-modules-2.6.18-5-sb1a-bcm91480b-di
+usb-modules-2.6.18-6-sb1-bcm91250a-di
+usb-modules-2.6.18-6-sb1a-bcm91480b-di
+usb-storage-modules-2.6.18-6-sb1-bcm91250a-di
+usb-storage-modules-2.6.18-6-sb1a-bcm91480b-di
 usbutils-udeb
 user-setup-udeb
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.6.18-4-qemu-di
-xfs-modules-2.6.18-4-r4k-ip22-di
-xfs-modules-2.6.18-4-r5k-ip32-di
-xfs-modules-2.6.18-4-sb1-bcm91250a-di
-xfs-modules-2.6.18-4-sb1a-bcm91480b-di
-xfs-modules-2.6.18-5-qemu-di
-xfs-modules-2.6.18-5-r4k-ip22-di
-xfs-modules-2.6.18-5-r5k-ip32-di
-xfs-modules-2.6.18-5-sb1-bcm91250a-di
-xfs-modules-2.6.18-5-sb1a-bcm91480b-di
+xfs-modules-2.6.18-6-qemu-di
+xfs-modules-2.6.18-6-r4k-ip22-di
+xfs-modules-2.6.18-6-r5k-ip32-di
+xfs-modules-2.6.18-6-sb1-bcm91250a-di
+xfs-modules-2.6.18-6-sb1a-bcm91480b-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_mips */
@@ -1215,12 +971,9 @@ base-installer
 beep-udeb
 bterm-unifont
 cdebconf-newt-entropy
-cdrom-core-modules-2.6.18-4-r5k-cobalt-di
-cdrom-core-modules-2.6.18-4-sb1-bcm91250a-di
-cdrom-core-modules-2.6.18-4-sb1a-bcm91480b-di
-cdrom-core-modules-2.6.18-5-r5k-cobalt-di
-cdrom-core-modules-2.6.18-5-sb1-bcm91250a-di
-cdrom-core-modules-2.6.18-5-sb1a-bcm91480b-di
+cdrom-core-modules-2.6.18-6-r5k-cobalt-di
+cdrom-core-modules-2.6.18-6-sb1-bcm91250a-di
+cdrom-core-modules-2.6.18-6-sb1a-bcm91480b-di
 cfdisk-udeb
 choose-mirror
 choose-mirror-bin
@@ -1236,16 +989,11 @@ console-keymaps-dec
 console-keymaps-mac
 console-keymaps-sun
 console-keymaps-usb
-crypto-modules-2.6.18-4-r3k-kn02-di
-crypto-modules-2.6.18-4-r4k-kn04-di
-crypto-modules-2.6.18-4-r5k-cobalt-di
-crypto-modules-2.6.18-4-sb1-bcm91250a-di
-crypto-modules-2.6.18-4-sb1a-bcm91480b-di
-crypto-modules-2.6.18-5-r3k-kn02-di
-crypto-modules-2.6.18-5-r4k-kn04-di
-crypto-modules-2.6.18-5-r5k-cobalt-di
-crypto-modules-2.6.18-5-sb1-bcm91250a-di
-crypto-modules-2.6.18-5-sb1a-bcm91480b-di
+crypto-modules-2.6.18-6-r3k-kn02-di
+crypto-modules-2.6.18-6-r4k-kn04-di
+crypto-modules-2.6.18-6-r5k-cobalt-di
+crypto-modules-2.6.18-6-sb1-bcm91250a-di
+crypto-modules-2.6.18-6-sb1a-bcm91480b-di
 cryptsetup-udeb
 debian-archive-keyring-udeb
 debootstrap-udeb
@@ -1260,49 +1008,30 @@ dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
-fat-modules-2.6.18-4-qemu-di
-fat-modules-2.6.18-4-r5k-cobalt-di
-fat-modules-2.6.18-4-sb1-bcm91250a-di
-fat-modules-2.6.18-4-sb1a-bcm91480b-di
-fat-modules-2.6.18-5-qemu-di
-fat-modules-2.6.18-5-r5k-cobalt-di
-fat-modules-2.6.18-5-sb1-bcm91250a-di
-fat-modules-2.6.18-5-sb1a-bcm91480b-di
-fb-modules-2.6.18-4-sb1-bcm91250a-di
-fb-modules-2.6.18-4-sb1a-bcm91480b-di
-fb-modules-2.6.18-5-sb1-bcm91250a-di
-fb-modules-2.6.18-5-sb1a-bcm91480b-di
+fat-modules-2.6.18-6-qemu-di
+fat-modules-2.6.18-6-r5k-cobalt-di
+fat-modules-2.6.18-6-sb1-bcm91250a-di
+fat-modules-2.6.18-6-sb1a-bcm91480b-di
+fb-modules-2.6.18-6-sb1-bcm91250a-di
+fb-modules-2.6.18-6-sb1a-bcm91480b-di
 fdisk-udeb
 finish-install
 gnupg-udeb
 gpgv-udeb
 gtk2-engines-udeb
-ide-modules-2.6.18-4-sb1-bcm91250a-di
-ide-modules-2.6.18-4-sb1a-bcm91480b-di
-ide-modules-2.6.18-5-sb1-bcm91250a-di
-ide-modules-2.6.18-5-sb1a-bcm91480b-di
-input-modules-2.6.18-4-sb1-bcm91250a-di
-input-modules-2.6.18-4-sb1a-bcm91480b-di
-input-modules-2.6.18-5-sb1-bcm91250a-di
-input-modules-2.6.18-5-sb1a-bcm91480b-di
-ipv6-modules-2.6.18-4-r3k-kn02-di
-ipv6-modules-2.6.18-4-r4k-kn04-di
-ipv6-modules-2.6.18-4-r5k-cobalt-di
-ipv6-modules-2.6.18-4-sb1-bcm91250a-di
-ipv6-modules-2.6.18-4-sb1a-bcm91480b-di
-ipv6-modules-2.6.18-5-r3k-kn02-di
-ipv6-modules-2.6.18-5-r4k-kn04-di
-ipv6-modules-2.6.18-5-r5k-cobalt-di
-ipv6-modules-2.6.18-5-sb1-bcm91250a-di
-ipv6-modules-2.6.18-5-sb1a-bcm91480b-di
-jfs-modules-2.6.18-4-qemu-di
-jfs-modules-2.6.18-4-r5k-cobalt-di
-jfs-modules-2.6.18-4-sb1-bcm91250a-di
-jfs-modules-2.6.18-4-sb1a-bcm91480b-di
-jfs-modules-2.6.18-5-qemu-di
-jfs-modules-2.6.18-5-r5k-cobalt-di
-jfs-modules-2.6.18-5-sb1-bcm91250a-di
-jfs-modules-2.6.18-5-sb1a-bcm91480b-di
+ide-modules-2.6.18-6-sb1-bcm91250a-di
+ide-modules-2.6.18-6-sb1a-bcm91480b-di
+input-modules-2.6.18-6-sb1-bcm91250a-di
+input-modules-2.6.18-6-sb1a-bcm91480b-di
+ipv6-modules-2.6.18-6-r3k-kn02-di
+ipv6-modules-2.6.18-6-r4k-kn04-di
+ipv6-modules-2.6.18-6-r5k-cobalt-di
+ipv6-modules-2.6.18-6-sb1-bcm91250a-di
+ipv6-modules-2.6.18-6-sb1a-bcm91480b-di
+jfs-modules-2.6.18-6-qemu-di
+jfs-modules-2.6.18-6-r5k-cobalt-di
+jfs-modules-2.6.18-6-sb1-bcm91250a-di
+jfs-modules-2.6.18-6-sb1a-bcm91480b-di
 jfsutils-udeb
 kbd-chooser
 klibc-utils-floppy-udeb
@@ -1321,38 +1050,24 @@ libsysfs2-udeb
 libtextwrap1-udeb
 libusb-0.1-udeb
 libuuid1-udeb
-loop-aes-modules-2.6.18-4-qemu-di
-loop-aes-modules-2.6.18-4-r3k-kn02-di
-loop-aes-modules-2.6.18-4-r4k-kn04-di
-loop-aes-modules-2.6.18-4-r5k-cobalt-di
-loop-aes-modules-2.6.18-4-sb1-bcm91250a-di
-loop-aes-modules-2.6.18-4-sb1a-bcm91480b-di
-loop-aes-modules-2.6.18-5-qemu-di
-loop-aes-modules-2.6.18-5-r3k-kn02-di
-loop-aes-modules-2.6.18-5-r4k-kn04-di
-loop-aes-modules-2.6.18-5-r5k-cobalt-di
-loop-aes-modules-2.6.18-5-sb1-bcm91250a-di
-loop-aes-modules-2.6.18-5-sb1a-bcm91480b-di
-loop-modules-2.6.18-4-qemu-di
-loop-modules-2.6.18-4-r5k-cobalt-di
-loop-modules-2.6.18-4-sb1-bcm91250a-di
-loop-modules-2.6.18-4-sb1a-bcm91480b-di
-loop-modules-2.6.18-5-qemu-di
-loop-modules-2.6.18-5-r5k-cobalt-di
-loop-modules-2.6.18-5-sb1-bcm91250a-di
-loop-modules-2.6.18-5-sb1a-bcm91480b-di
+loop-aes-modules-2.6.18-6-qemu-di
+loop-aes-modules-2.6.18-6-r3k-kn02-di
+loop-aes-modules-2.6.18-6-r4k-kn04-di
+loop-aes-modules-2.6.18-6-r5k-cobalt-di
+loop-aes-modules-2.6.18-6-sb1-bcm91250a-di
+loop-aes-modules-2.6.18-6-sb1a-bcm91480b-di
+loop-modules-2.6.18-6-qemu-di
+loop-modules-2.6.18-6-r5k-cobalt-di
+loop-modules-2.6.18-6-sb1-bcm91250a-di
+loop-modules-2.6.18-6-sb1a-bcm91480b-di
 lowmem
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.6.18-4-qemu-di
-md-modules-2.6.18-4-r5k-cobalt-di
-md-modules-2.6.18-4-sb1-bcm91250a-di
-md-modules-2.6.18-4-sb1a-bcm91480b-di
-md-modules-2.6.18-5-qemu-di
-md-modules-2.6.18-5-r5k-cobalt-di
-md-modules-2.6.18-5-sb1-bcm91250a-di
-md-modules-2.6.18-5-sb1a-bcm91480b-di
+md-modules-2.6.18-6-qemu-di
+md-modules-2.6.18-6-r5k-cobalt-di
+md-modules-2.6.18-6-sb1-bcm91250a-di
+md-modules-2.6.18-6-sb1a-bcm91480b-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
@@ -1364,8 +1079,7 @@ net-retriever
 netcfg
 network-console
 network-preseed
-nfs-modules-2.6.18-4-r5k-cobalt-di
-nfs-modules-2.6.18-5-r5k-cobalt-di
+nfs-modules-2.6.18-6-r5k-cobalt-di
 nobootloader
 ntfsprogs-udeb
 oldsys-preseed
@@ -1398,79 +1112,50 @@ pciutils-udeb
 pcmcia-cs-udeb
 pcmciautils-udeb
 pkgsel
-ppp-modules-2.6.18-4-r5k-cobalt-di
-ppp-modules-2.6.18-4-sb1-bcm91250a-di
-ppp-modules-2.6.18-4-sb1a-bcm91480b-di
-ppp-modules-2.6.18-5-r5k-cobalt-di
-ppp-modules-2.6.18-5-sb1-bcm91250a-di
-ppp-modules-2.6.18-5-sb1a-bcm91480b-di
+ppp-modules-2.6.18-6-r5k-cobalt-di
+ppp-modules-2.6.18-6-sb1-bcm91250a-di
+ppp-modules-2.6.18-6-sb1a-bcm91480b-di
 ppp-udeb
 pwgen-udeb
-reiserfs-modules-2.6.18-4-qemu-di
-reiserfs-modules-2.6.18-4-r3k-kn02-di
-reiserfs-modules-2.6.18-4-r4k-kn04-di
-reiserfs-modules-2.6.18-4-r5k-cobalt-di
-reiserfs-modules-2.6.18-4-sb1-bcm91250a-di
-reiserfs-modules-2.6.18-4-sb1a-bcm91480b-di
-reiserfs-modules-2.6.18-5-qemu-di
-reiserfs-modules-2.6.18-5-r3k-kn02-di
-reiserfs-modules-2.6.18-5-r4k-kn04-di
-reiserfs-modules-2.6.18-5-r5k-cobalt-di
-reiserfs-modules-2.6.18-5-sb1-bcm91250a-di
-reiserfs-modules-2.6.18-5-sb1a-bcm91480b-di
+reiserfs-modules-2.6.18-6-qemu-di
+reiserfs-modules-2.6.18-6-r3k-kn02-di
+reiserfs-modules-2.6.18-6-r4k-kn04-di
+reiserfs-modules-2.6.18-6-r5k-cobalt-di
+reiserfs-modules-2.6.18-6-sb1-bcm91250a-di
+reiserfs-modules-2.6.18-6-sb1a-bcm91480b-di
 rescue-mode
-sata-modules-2.6.18-4-sb1-bcm91250a-di
-sata-modules-2.6.18-4-sb1a-bcm91480b-di
-sata-modules-2.6.18-5-sb1-bcm91250a-di
-sata-modules-2.6.18-5-sb1a-bcm91480b-di
+sata-modules-2.6.18-6-sb1-bcm91250a-di
+sata-modules-2.6.18-6-sb1a-bcm91480b-di
 save-logs
-scsi-common-modules-2.6.18-4-sb1-bcm91250a-di
-scsi-common-modules-2.6.18-4-sb1a-bcm91480b-di
-scsi-common-modules-2.6.18-5-sb1-bcm91250a-di
-scsi-common-modules-2.6.18-5-sb1a-bcm91480b-di
-scsi-core-modules-2.6.18-4-sb1-bcm91250a-di
-scsi-core-modules-2.6.18-4-sb1a-bcm91480b-di
-scsi-core-modules-2.6.18-5-sb1-bcm91250a-di
-scsi-core-modules-2.6.18-5-sb1a-bcm91480b-di
-scsi-modules-2.6.18-4-sb1-bcm91250a-di
-scsi-modules-2.6.18-4-sb1a-bcm91480b-di
-scsi-modules-2.6.18-5-sb1-bcm91250a-di
-scsi-modules-2.6.18-5-sb1a-bcm91480b-di
+scsi-common-modules-2.6.18-6-sb1-bcm91250a-di
+scsi-common-modules-2.6.18-6-sb1a-bcm91480b-di
+scsi-core-modules-2.6.18-6-sb1-bcm91250a-di
+scsi-core-modules-2.6.18-6-sb1a-bcm91480b-di
+scsi-modules-2.6.18-6-sb1-bcm91250a-di
+scsi-modules-2.6.18-6-sb1a-bcm91480b-di
 sibyl-installer
 strace-udeb
 tzsetup-udeb
-usb-modules-2.6.18-4-sb1-bcm91250a-di
-usb-modules-2.6.18-4-sb1a-bcm91480b-di
-usb-modules-2.6.18-5-sb1-bcm91250a-di
-usb-modules-2.6.18-5-sb1a-bcm91480b-di
-usb-storage-modules-2.6.18-4-sb1-bcm91250a-di
-usb-storage-modules-2.6.18-4-sb1a-bcm91480b-di
-usb-storage-modules-2.6.18-5-sb1-bcm91250a-di
-usb-storage-modules-2.6.18-5-sb1a-bcm91480b-di
+usb-modules-2.6.18-6-sb1-bcm91250a-di
+usb-modules-2.6.18-6-sb1a-bcm91480b-di
+usb-storage-modules-2.6.18-6-sb1-bcm91250a-di
+usb-storage-modules-2.6.18-6-sb1a-bcm91480b-di
 usbutils-udeb
 user-setup-udeb
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.6.18-4-qemu-di
-xfs-modules-2.6.18-4-r5k-cobalt-di
-xfs-modules-2.6.18-4-sb1-bcm91250a-di
-xfs-modules-2.6.18-4-sb1a-bcm91480b-di
-xfs-modules-2.6.18-5-qemu-di
-xfs-modules-2.6.18-5-r5k-cobalt-di
-xfs-modules-2.6.18-5-sb1-bcm91250a-di
-xfs-modules-2.6.18-5-sb1a-bcm91480b-di
+xfs-modules-2.6.18-6-qemu-di
+xfs-modules-2.6.18-6-r5k-cobalt-di
+xfs-modules-2.6.18-6-sb1-bcm91250a-di
+xfs-modules-2.6.18-6-sb1a-bcm91480b-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_mipsel */
 #ifdef ARCH_powerpc
-affs-modules-2.6.18-4-powerpc-di
-affs-modules-2.6.18-4-powerpc-miboot-di
-affs-modules-2.6.18-4-powerpc64-di
-affs-modules-2.6.18-4-prep-di
-affs-modules-2.6.18-5-powerpc-di
-affs-modules-2.6.18-5-powerpc-miboot-di
-affs-modules-2.6.18-5-powerpc64-di
-affs-modules-2.6.18-5-prep-di
+affs-modules-2.6.18-6-powerpc-di
+affs-modules-2.6.18-6-powerpc-miboot-di
+affs-modules-2.6.18-6-powerpc64-di
+affs-modules-2.6.18-6-prep-di
 apt-cdrom-setup
 apt-mirror-setup
 apt-setup-udeb
@@ -1489,14 +1174,10 @@ console-keymaps-atari
 console-keymaps-dec
 console-keymaps-mac
 console-keymaps-sun
-crypto-modules-2.6.18-4-powerpc-di
-crypto-modules-2.6.18-4-powerpc-miboot-di
-crypto-modules-2.6.18-4-powerpc64-di
-crypto-modules-2.6.18-4-prep-di
-crypto-modules-2.6.18-5-powerpc-di
-crypto-modules-2.6.18-5-powerpc-miboot-di
-crypto-modules-2.6.18-5-powerpc64-di
-crypto-modules-2.6.18-5-prep-di
+crypto-modules-2.6.18-6-powerpc-di
+crypto-modules-2.6.18-6-powerpc-miboot-di
+crypto-modules-2.6.18-6-powerpc64-di
+crypto-modules-2.6.18-6-prep-di
 cryptsetup-udeb
 debian-archive-keyring-udeb
 debootstrap-udeb
@@ -1509,87 +1190,49 @@ dmraid-udeb
 dmsetup-udeb
 e2fsprogs-udeb
 ethdetect
-ext2-modules-2.6.18-4-powerpc-di
-ext2-modules-2.6.18-4-powerpc-miboot-di
-ext2-modules-2.6.18-4-powerpc64-di
-ext2-modules-2.6.18-4-prep-di
-ext2-modules-2.6.18-5-powerpc-di
-ext2-modules-2.6.18-5-powerpc-miboot-di
-ext2-modules-2.6.18-5-powerpc64-di
-ext2-modules-2.6.18-5-prep-di
-ext3-modules-2.6.18-4-powerpc-di
-ext3-modules-2.6.18-4-powerpc-miboot-di
-ext3-modules-2.6.18-4-powerpc64-di
-ext3-modules-2.6.18-4-prep-di
-ext3-modules-2.6.18-5-powerpc-di
-ext3-modules-2.6.18-5-powerpc-miboot-di
-ext3-modules-2.6.18-5-powerpc64-di
-ext3-modules-2.6.18-5-prep-di
-fancontrol-modules-2.6.18-4-powerpc64-di
-fancontrol-modules-2.6.18-5-powerpc64-di
-fat-modules-2.6.18-4-powerpc-di
-fat-modules-2.6.18-4-powerpc-miboot-di
-fat-modules-2.6.18-4-powerpc64-di
-fat-modules-2.6.18-4-prep-di
-fat-modules-2.6.18-5-powerpc-di
-fat-modules-2.6.18-5-powerpc-miboot-di
-fat-modules-2.6.18-5-powerpc64-di
-fat-modules-2.6.18-5-prep-di
+ext2-modules-2.6.18-6-powerpc-di
+ext2-modules-2.6.18-6-powerpc-miboot-di
+ext2-modules-2.6.18-6-powerpc64-di
+ext2-modules-2.6.18-6-prep-di
+ext3-modules-2.6.18-6-powerpc-di
+ext3-modules-2.6.18-6-powerpc-miboot-di
+ext3-modules-2.6.18-6-powerpc64-di
+ext3-modules-2.6.18-6-prep-di
+fancontrol-modules-2.6.18-6-powerpc64-di
+fat-modules-2.6.18-6-powerpc-di
+fat-modules-2.6.18-6-powerpc-miboot-di
+fat-modules-2.6.18-6-powerpc64-di
+fat-modules-2.6.18-6-prep-di
 fdisk-udeb
 finish-install
-firmware-modules-2.6.18-4-powerpc-di
-firmware-modules-2.6.18-4-powerpc-miboot-di
-firmware-modules-2.6.18-4-powerpc64-di
-firmware-modules-2.6.18-4-prep-di
-firmware-modules-2.6.18-5-powerpc-di
-firmware-modules-2.6.18-5-powerpc-miboot-di
-firmware-modules-2.6.18-5-powerpc64-di
-firmware-modules-2.6.18-5-prep-di
-floppy-modules-2.6.18-4-powerpc-di
-floppy-modules-2.6.18-4-powerpc-miboot-di
-floppy-modules-2.6.18-4-powerpc64-di
-floppy-modules-2.6.18-4-prep-di
-floppy-modules-2.6.18-5-powerpc-di
-floppy-modules-2.6.18-5-powerpc-miboot-di
-floppy-modules-2.6.18-5-powerpc64-di
-floppy-modules-2.6.18-5-prep-di
+firmware-modules-2.6.18-6-powerpc-di
+firmware-modules-2.6.18-6-powerpc-miboot-di
+firmware-modules-2.6.18-6-powerpc64-di
+firmware-modules-2.6.18-6-prep-di
+floppy-modules-2.6.18-6-powerpc-di
+floppy-modules-2.6.18-6-powerpc-miboot-di
+floppy-modules-2.6.18-6-powerpc64-di
+floppy-modules-2.6.18-6-prep-di
 gnupg-udeb
 gpgv-udeb
 gtk2-engines-udeb
-hfs-modules-2.6.18-4-powerpc-di
-hfs-modules-2.6.18-4-powerpc-miboot-di
-hfs-modules-2.6.18-4-powerpc64-di
-hfs-modules-2.6.18-4-prep-di
-hfs-modules-2.6.18-5-powerpc-di
-hfs-modules-2.6.18-5-powerpc-miboot-di
-hfs-modules-2.6.18-5-powerpc64-di
-hfs-modules-2.6.18-5-prep-di
-hypervisor-modules-2.6.18-4-powerpc64-di
-hypervisor-modules-2.6.18-5-powerpc64-di
-ipv6-modules-2.6.18-4-powerpc-di
-ipv6-modules-2.6.18-4-powerpc-miboot-di
-ipv6-modules-2.6.18-4-powerpc64-di
-ipv6-modules-2.6.18-4-prep-di
-ipv6-modules-2.6.18-5-powerpc-di
-ipv6-modules-2.6.18-5-powerpc-miboot-di
-ipv6-modules-2.6.18-5-powerpc64-di
-ipv6-modules-2.6.18-5-prep-di
-irda-modules-2.6.18-4-powerpc-di
-irda-modules-2.6.18-4-powerpc-miboot-di
-irda-modules-2.6.18-4-powerpc64-di
-irda-modules-2.6.18-4-prep-di
-irda-modules-2.6.18-5-powerpc-di
-irda-modules-2.6.18-5-powerpc-miboot-di
-irda-modules-2.6.18-5-powerpc64-di
-irda-modules-2.6.18-5-prep-di
-jfs-modules-2.6.18-4-powerpc-di
-jfs-modules-2.6.18-4-powerpc-miboot-di
-jfs-modules-2.6.18-4-powerpc64-di
-jfs-modules-2.6.18-4-prep-di
-jfs-modules-2.6.18-5-powerpc-di
-jfs-modules-2.6.18-5-powerpc-miboot-di
-jfs-modules-2.6.18-5-powerpc64-di
-jfs-modules-2.6.18-5-prep-di
+hfs-modules-2.6.18-6-powerpc-di
+hfs-modules-2.6.18-6-powerpc-miboot-di
+hfs-modules-2.6.18-6-powerpc64-di
+hfs-modules-2.6.18-6-prep-di
+hypervisor-modules-2.6.18-6-powerpc64-di
+ipv6-modules-2.6.18-6-powerpc-di
+ipv6-modules-2.6.18-6-powerpc-miboot-di
+ipv6-modules-2.6.18-6-powerpc64-di
+ipv6-modules-2.6.18-6-prep-di
+irda-modules-2.6.18-6-powerpc-di
+irda-modules-2.6.18-6-powerpc-miboot-di
+irda-modules-2.6.18-6-powerpc64-di
+irda-modules-2.6.18-6-prep-di
+jfs-modules-2.6.18-6-powerpc-di
+jfs-modules-2.6.18-6-powerpc-miboot-di
+jfs-modules-2.6.18-6-powerpc64-di
+jfs-modules-2.6.18-6-prep-di
 jfsutils-udeb
 klibc-utils-floppy-udeb
 libblkid1-udeb
@@ -1607,34 +1250,22 @@ libsysfs2-udeb
 libtextwrap1-udeb
 libusb-0.1-udeb
 libuuid1-udeb
-loop-aes-modules-2.6.18-4-powerpc-di
-loop-aes-modules-2.6.18-4-powerpc-miboot-di
-loop-aes-modules-2.6.18-4-powerpc64-di
-loop-aes-modules-2.6.18-4-prep-di
-loop-aes-modules-2.6.18-5-powerpc-di
-loop-aes-modules-2.6.18-5-powerpc-miboot-di
-loop-aes-modules-2.6.18-5-powerpc64-di
-loop-aes-modules-2.6.18-5-prep-di
-loop-modules-2.6.18-4-powerpc-di
-loop-modules-2.6.18-4-powerpc-miboot-di
-loop-modules-2.6.18-4-powerpc64-di
-loop-modules-2.6.18-4-prep-di
-loop-modules-2.6.18-5-powerpc-di
-loop-modules-2.6.18-5-powerpc-miboot-di
-loop-modules-2.6.18-5-powerpc64-di
-loop-modules-2.6.18-5-prep-di
+loop-aes-modules-2.6.18-6-powerpc-di
+loop-aes-modules-2.6.18-6-powerpc-miboot-di
+loop-aes-modules-2.6.18-6-powerpc64-di
+loop-aes-modules-2.6.18-6-prep-di
+loop-modules-2.6.18-6-powerpc-di
+loop-modules-2.6.18-6-powerpc-miboot-di
+loop-modules-2.6.18-6-powerpc64-di
+loop-modules-2.6.18-6-prep-di
 lowmem
 lvm2-udeb
 lvmcfg-utils
 mac-fdisk-udeb
-md-modules-2.6.18-4-powerpc-di
-md-modules-2.6.18-4-powerpc-miboot-di
-md-modules-2.6.18-4-powerpc64-di
-md-modules-2.6.18-4-prep-di
-md-modules-2.6.18-5-powerpc-di
-md-modules-2.6.18-5-powerpc-miboot-di
-md-modules-2.6.18-5-powerpc64-di
-md-modules-2.6.18-5-prep-di
+md-modules-2.6.18-6-powerpc-di
+md-modules-2.6.18-6-powerpc-miboot-di
+md-modules-2.6.18-6-powerpc64-di
+md-modules-2.6.18-6-prep-di
 mdadm-udeb
 mdcfg-utils
 mii-diag-udeb
@@ -1645,38 +1276,22 @@ net-retriever
 netcfg
 network-console
 network-preseed
-nic-extra-modules-2.6.18-4-powerpc-di
-nic-extra-modules-2.6.18-4-powerpc-miboot-di
-nic-extra-modules-2.6.18-4-powerpc64-di
-nic-extra-modules-2.6.18-4-prep-di
-nic-extra-modules-2.6.18-5-powerpc-di
-nic-extra-modules-2.6.18-5-powerpc-miboot-di
-nic-extra-modules-2.6.18-5-powerpc64-di
-nic-extra-modules-2.6.18-5-prep-di
-nic-modules-2.6.18-4-powerpc-di
-nic-modules-2.6.18-4-powerpc-miboot-di
-nic-modules-2.6.18-4-powerpc64-di
-nic-modules-2.6.18-4-prep-di
-nic-modules-2.6.18-5-powerpc-di
-nic-modules-2.6.18-5-powerpc-miboot-di
-nic-modules-2.6.18-5-powerpc64-di
-nic-modules-2.6.18-5-prep-di
-nic-pcmcia-modules-2.6.18-4-powerpc-di
-nic-pcmcia-modules-2.6.18-4-powerpc-miboot-di
-nic-pcmcia-modules-2.6.18-4-powerpc64-di
-nic-pcmcia-modules-2.6.18-4-prep-di
-nic-pcmcia-modules-2.6.18-5-powerpc-di
-nic-pcmcia-modules-2.6.18-5-powerpc-miboot-di
-nic-pcmcia-modules-2.6.18-5-powerpc64-di
-nic-pcmcia-modules-2.6.18-5-prep-di
-nic-shared-modules-2.6.18-4-powerpc-di
-nic-shared-modules-2.6.18-4-powerpc-miboot-di
-nic-shared-modules-2.6.18-4-powerpc64-di
-nic-shared-modules-2.6.18-4-prep-di
-nic-shared-modules-2.6.18-5-powerpc-di
-nic-shared-modules-2.6.18-5-powerpc-miboot-di
-nic-shared-modules-2.6.18-5-powerpc64-di
-nic-shared-modules-2.6.18-5-prep-di
+nic-extra-modules-2.6.18-6-powerpc-di
+nic-extra-modules-2.6.18-6-powerpc-miboot-di
+nic-extra-modules-2.6.18-6-powerpc64-di
+nic-extra-modules-2.6.18-6-prep-di
+nic-modules-2.6.18-6-powerpc-di
+nic-modules-2.6.18-6-powerpc-miboot-di
+nic-modules-2.6.18-6-powerpc64-di
+nic-modules-2.6.18-6-prep-di
+nic-pcmcia-modules-2.6.18-6-powerpc-di
+nic-pcmcia-modules-2.6.18-6-powerpc-miboot-di
+nic-pcmcia-modules-2.6.18-6-powerpc64-di
+nic-pcmcia-modules-2.6.18-6-prep-di
+nic-shared-modules-2.6.18-6-powerpc-di
+nic-shared-modules-2.6.18-6-powerpc-miboot-di
+nic-shared-modules-2.6.18-6-powerpc64-di
+nic-shared-modules-2.6.18-6-prep-di
 nobootloader
 ntfsprogs-udeb
 oldsys-preseed
@@ -1707,100 +1322,60 @@ partman-target
 partman-xfs
 pciutils-udeb
 pcmcia-cs-udeb
-pcmcia-modules-2.6.18-4-powerpc-di
-pcmcia-modules-2.6.18-4-powerpc-miboot-di
-pcmcia-modules-2.6.18-4-powerpc64-di
-pcmcia-modules-2.6.18-4-prep-di
-pcmcia-modules-2.6.18-5-powerpc-di
-pcmcia-modules-2.6.18-5-powerpc-miboot-di
-pcmcia-modules-2.6.18-5-powerpc64-di
-pcmcia-modules-2.6.18-5-prep-di
-pcmcia-storage-modules-2.6.18-4-powerpc-di
-pcmcia-storage-modules-2.6.18-4-powerpc-miboot-di
-pcmcia-storage-modules-2.6.18-4-powerpc64-di
-pcmcia-storage-modules-2.6.18-4-prep-di
-pcmcia-storage-modules-2.6.18-5-powerpc-di
-pcmcia-storage-modules-2.6.18-5-powerpc-miboot-di
-pcmcia-storage-modules-2.6.18-5-powerpc64-di
-pcmcia-storage-modules-2.6.18-5-prep-di
+pcmcia-modules-2.6.18-6-powerpc-di
+pcmcia-modules-2.6.18-6-powerpc-miboot-di
+pcmcia-modules-2.6.18-6-powerpc64-di
+pcmcia-modules-2.6.18-6-prep-di
+pcmcia-storage-modules-2.6.18-6-powerpc-di
+pcmcia-storage-modules-2.6.18-6-powerpc-miboot-di
+pcmcia-storage-modules-2.6.18-6-powerpc64-di
+pcmcia-storage-modules-2.6.18-6-prep-di
 pcmciautils-udeb
 pkgsel
 pmac-fdisk-udeb
-ppp-modules-2.6.18-4-powerpc-di
-ppp-modules-2.6.18-4-powerpc-miboot-di
-ppp-modules-2.6.18-4-powerpc64-di
-ppp-modules-2.6.18-4-prep-di
-ppp-modules-2.6.18-5-powerpc-di
-ppp-modules-2.6.18-5-powerpc-miboot-di
-ppp-modules-2.6.18-5-powerpc64-di
-ppp-modules-2.6.18-5-prep-di
+ppp-modules-2.6.18-6-powerpc-di
+ppp-modules-2.6.18-6-powerpc-miboot-di
+ppp-modules-2.6.18-6-powerpc64-di
+ppp-modules-2.6.18-6-prep-di
 ppp-udeb
 prep-installer
 pwgen-udeb
 quik-installer
-reiserfs-modules-2.6.18-4-powerpc-di
-reiserfs-modules-2.6.18-4-powerpc-miboot-di
-reiserfs-modules-2.6.18-4-powerpc64-di
-reiserfs-modules-2.6.18-4-prep-di
-reiserfs-modules-2.6.18-5-powerpc-di
-reiserfs-modules-2.6.18-5-powerpc-miboot-di
-reiserfs-modules-2.6.18-5-powerpc64-di
-reiserfs-modules-2.6.18-5-prep-di
+reiserfs-modules-2.6.18-6-powerpc-di
+reiserfs-modules-2.6.18-6-powerpc-miboot-di
+reiserfs-modules-2.6.18-6-powerpc64-di
+reiserfs-modules-2.6.18-6-prep-di
 rescue-mode
-sata-modules-2.6.18-4-powerpc-di
-sata-modules-2.6.18-4-powerpc-miboot-di
-sata-modules-2.6.18-4-powerpc64-di
-sata-modules-2.6.18-4-prep-di
-sata-modules-2.6.18-5-powerpc-di
-sata-modules-2.6.18-5-powerpc-miboot-di
-sata-modules-2.6.18-5-powerpc64-di
-sata-modules-2.6.18-5-prep-di
+sata-modules-2.6.18-6-powerpc-di
+sata-modules-2.6.18-6-powerpc-miboot-di
+sata-modules-2.6.18-6-powerpc64-di
+sata-modules-2.6.18-6-prep-di
 save-logs
-scsi-extra-modules-2.6.18-4-powerpc-di
-scsi-extra-modules-2.6.18-4-powerpc-miboot-di
-scsi-extra-modules-2.6.18-4-powerpc64-di
-scsi-extra-modules-2.6.18-4-prep-di
-scsi-extra-modules-2.6.18-5-powerpc-di
-scsi-extra-modules-2.6.18-5-powerpc-miboot-di
-scsi-extra-modules-2.6.18-5-powerpc64-di
-scsi-extra-modules-2.6.18-5-prep-di
-serial-modules-2.6.18-4-powerpc-di
-serial-modules-2.6.18-4-powerpc-miboot-di
-serial-modules-2.6.18-4-powerpc64-di
-serial-modules-2.6.18-4-prep-di
-serial-modules-2.6.18-5-powerpc-di
-serial-modules-2.6.18-5-powerpc-miboot-di
-serial-modules-2.6.18-5-powerpc64-di
-serial-modules-2.6.18-5-prep-di
+scsi-extra-modules-2.6.18-6-powerpc-di
+scsi-extra-modules-2.6.18-6-powerpc-miboot-di
+scsi-extra-modules-2.6.18-6-powerpc64-di
+scsi-extra-modules-2.6.18-6-prep-di
+serial-modules-2.6.18-6-powerpc-di
+serial-modules-2.6.18-6-powerpc-miboot-di
+serial-modules-2.6.18-6-powerpc64-di
+serial-modules-2.6.18-6-prep-di
 strace-udeb
 tzsetup-udeb
-ufs-modules-2.6.18-4-powerpc-di
-ufs-modules-2.6.18-4-powerpc-miboot-di
-ufs-modules-2.6.18-4-powerpc64-di
-ufs-modules-2.6.18-4-prep-di
-ufs-modules-2.6.18-5-powerpc-di
-ufs-modules-2.6.18-5-powerpc-miboot-di
-ufs-modules-2.6.18-5-powerpc64-di
-ufs-modules-2.6.18-5-prep-di
-usb-serial-modules-2.6.18-4-powerpc-di
-usb-serial-modules-2.6.18-4-powerpc-miboot-di
-usb-serial-modules-2.6.18-4-powerpc64-di
-usb-serial-modules-2.6.18-4-prep-di
-usb-serial-modules-2.6.18-5-powerpc-di
-usb-serial-modules-2.6.18-5-powerpc-miboot-di
-usb-serial-modules-2.6.18-5-powerpc64-di
-usb-serial-modules-2.6.18-5-prep-di
+ufs-modules-2.6.18-6-powerpc-di
+ufs-modules-2.6.18-6-powerpc-miboot-di
+ufs-modules-2.6.18-6-powerpc64-di
+ufs-modules-2.6.18-6-prep-di
+usb-serial-modules-2.6.18-6-powerpc-di
+usb-serial-modules-2.6.18-6-powerpc-miboot-di
+usb-serial-modules-2.6.18-6-powerpc64-di
+usb-serial-modules-2.6.18-6-prep-di
 usbutils-udeb
 user-setup-udeb
 wireless-tools-udeb
-xfs-modules-2.6.18-4-powerpc-di
-xfs-modules-2.6.18-4-powerpc-miboot-di
-xfs-modules-2.6.18-4-powerpc64-di
-xfs-modules-2.6.18-4-prep-di
-xfs-modules-2.6.18-5-powerpc-di
-xfs-modules-2.6.18-5-powerpc-miboot-di
-xfs-modules-2.6.18-5-powerpc64-di
-xfs-modules-2.6.18-5-prep-di
+xfs-modules-2.6.18-6-powerpc-di
+xfs-modules-2.6.18-6-powerpc-miboot-di
+xfs-modules-2.6.18-6-powerpc64-di
+xfs-modules-2.6.18-6-prep-di
 xfsprogs-udeb
 yaboot-installer
 zlib1g-udeb
@@ -1816,10 +1391,8 @@ base-installer
 beep-udeb
 bterm-unifont
 cdebconf-newt-entropy
-cdrom-core-modules-2.6.18-4-sparc32-di
-cdrom-core-modules-2.6.18-4-sparc64-di
-cdrom-core-modules-2.6.18-5-sparc32-di
-cdrom-core-modules-2.6.18-5-sparc64-di
+cdrom-core-modules-2.6.18-6-sparc32-di
+cdrom-core-modules-2.6.18-6-sparc64-di
 choose-mirror
 choose-mirror-bin
 clock-setup
@@ -1831,10 +1404,8 @@ console-keymaps-dec
 console-keymaps-mac
 console-keymaps-sun
 console-keymaps-usb
-crypto-modules-2.6.18-4-sparc32-di
-crypto-modules-2.6.18-4-sparc64-di
-crypto-modules-2.6.18-5-sparc32-di
-crypto-modules-2.6.18-5-sparc64-di
+crypto-modules-2.6.18-6-sparc32-di
+crypto-modules-2.6.18-6-sparc64-di
 cryptsetup-udeb
 debian-archive-keyring-udeb
 debootstrap-udeb
@@ -1848,27 +1419,19 @@ dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
-ext3-modules-2.6.18-4-sparc32-di
-ext3-modules-2.6.18-4-sparc64-di
-ext3-modules-2.6.18-5-sparc32-di
-ext3-modules-2.6.18-5-sparc64-di
-fat-modules-2.6.18-4-sparc32-di
-fat-modules-2.6.18-4-sparc64-di
-fat-modules-2.6.18-5-sparc32-di
-fat-modules-2.6.18-5-sparc64-di
+ext3-modules-2.6.18-6-sparc32-di
+ext3-modules-2.6.18-6-sparc64-di
+fat-modules-2.6.18-6-sparc32-di
+fat-modules-2.6.18-6-sparc64-di
 fdisk-udeb
 finish-install
 gnupg-udeb
 gpgv-udeb
 gtk2-engines-udeb
-ide-modules-2.6.18-4-sparc64-di
-ide-modules-2.6.18-5-sparc64-di
-ipv6-modules-2.6.18-4-sparc32-di
-ipv6-modules-2.6.18-4-sparc64-di
-ipv6-modules-2.6.18-5-sparc32-di
-ipv6-modules-2.6.18-5-sparc64-di
-jfs-modules-2.6.18-4-sparc64-di
-jfs-modules-2.6.18-5-sparc64-di
+ide-modules-2.6.18-6-sparc64-di
+ipv6-modules-2.6.18-6-sparc32-di
+ipv6-modules-2.6.18-6-sparc64-di
+jfs-modules-2.6.18-6-sparc64-di
 jfsutils-udeb
 kbd-chooser
 klibc-utils-floppy-udeb
@@ -1887,17 +1450,13 @@ libsysfs2-udeb
 libtextwrap1-udeb
 libusb-0.1-udeb
 libuuid1-udeb
-loop-aes-modules-2.6.18-4-sparc32-di
-loop-aes-modules-2.6.18-4-sparc64-di
-loop-aes-modules-2.6.18-5-sparc32-di
-loop-aes-modules-2.6.18-5-sparc64-di
+loop-aes-modules-2.6.18-6-sparc32-di
+loop-aes-modules-2.6.18-6-sparc64-di
 lowmem
 lvm2-udeb
 lvmcfg-utils
-md-modules-2.6.18-4-sparc32-di
-md-modules-2.6.18-4-sparc64-di
-md-modules-2.6.18-5-sparc32-di
-md-modules-2.6.18-5-sparc64-di
+md-modules-2.6.18-6-sparc32-di
+md-modules-2.6.18-6-sparc64-di
 mdadm-udeb
 mdcfg-utils
 mii-diag-udeb
@@ -1908,10 +1467,8 @@ net-retriever
 netcfg
 network-console
 network-preseed
-nic-modules-2.6.18-4-sparc32-di
-nic-modules-2.6.18-4-sparc64-di
-nic-modules-2.6.18-5-sparc32-di
-nic-modules-2.6.18-5-sparc64-di
+nic-modules-2.6.18-6-sparc32-di
+nic-modules-2.6.18-6-sparc64-di
 nobootloader
 ntfsprogs-udeb
 oldsys-preseed
@@ -1942,54 +1499,38 @@ pciutils-udeb
 pcmcia-cs-udeb
 pcmciautils-udeb
 pkgsel
-plip-modules-2.6.18-4-sparc32-di
-plip-modules-2.6.18-4-sparc64-di
-plip-modules-2.6.18-5-sparc32-di
-plip-modules-2.6.18-5-sparc64-di
-ppp-modules-2.6.18-4-sparc32-di
-ppp-modules-2.6.18-4-sparc64-di
-ppp-modules-2.6.18-5-sparc32-di
-ppp-modules-2.6.18-5-sparc64-di
+plip-modules-2.6.18-6-sparc32-di
+plip-modules-2.6.18-6-sparc64-di
+ppp-modules-2.6.18-6-sparc32-di
+ppp-modules-2.6.18-6-sparc64-di
 ppp-udeb
 pwgen-udeb
-reiserfs-modules-2.6.18-4-sparc32-di
-reiserfs-modules-2.6.18-4-sparc64-di
-reiserfs-modules-2.6.18-5-sparc32-di
-reiserfs-modules-2.6.18-5-sparc64-di
+reiserfs-modules-2.6.18-6-sparc32-di
+reiserfs-modules-2.6.18-6-sparc64-di
 rescue-mode
-sata-modules-2.6.18-4-sparc64-di
-sata-modules-2.6.18-5-sparc64-di
+sata-modules-2.6.18-6-sparc64-di
 save-logs
-scsi-common-modules-2.6.18-4-sparc32-di
-scsi-common-modules-2.6.18-4-sparc64-di
-scsi-common-modules-2.6.18-5-sparc32-di
-scsi-common-modules-2.6.18-5-sparc64-di
-scsi-core-modules-2.6.18-4-sparc32-di
-scsi-core-modules-2.6.18-4-sparc64-di
-scsi-core-modules-2.6.18-5-sparc32-di
-scsi-core-modules-2.6.18-5-sparc64-di
-scsi-extra-modules-2.6.18-4-sparc64-di
-scsi-extra-modules-2.6.18-5-sparc64-di
+scsi-common-modules-2.6.18-6-sparc32-di
+scsi-common-modules-2.6.18-6-sparc64-di
+scsi-core-modules-2.6.18-6-sparc32-di
+scsi-core-modules-2.6.18-6-sparc64-di
+scsi-extra-modules-2.6.18-6-sparc64-di
 silo-installer
 sparc-utils-udeb
 strace-udeb
 tzsetup-udeb
-usb-modules-2.6.18-4-sparc64-di
-usb-modules-2.6.18-5-sparc64-di
+usb-modules-2.6.18-6-sparc64-di
 usbutils-udeb
 user-setup-udeb
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.6.18-4-sparc32-di
-xfs-modules-2.6.18-4-sparc64-di
-xfs-modules-2.6.18-5-sparc32-di
-xfs-modules-2.6.18-5-sparc64-di
+xfs-modules-2.6.18-6-sparc32-di
+xfs-modules-2.6.18-6-sparc64-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_sparc */
 #ifdef ARCH_amd64
-acpi-modules-2.6.18-4-amd64-di
-acpi-modules-2.6.18-5-amd64-di
+acpi-modules-2.6.18-6-amd64-di
 apt-cdrom-setup
 apt-mirror-setup
 apt-setup-udeb
@@ -2008,11 +1549,9 @@ console-keymaps-atari
 console-keymaps-dec
 console-keymaps-mac
 console-keymaps-sun
-core-modules-2.6.18-5-amd64-di
-crc-modules-2.6.18-4-amd64-di
-crc-modules-2.6.18-5-amd64-di
-crypto-modules-2.6.18-4-amd64-di
-crypto-modules-2.6.18-5-amd64-di
+core-modules-2.6.18-6-amd64-di
+crc-modules-2.6.18-6-amd64-di
+crypto-modules-2.6.18-6-amd64-di
 cryptsetup-udeb
 debian-archive-keyring-udeb
 debootstrap-udeb
@@ -2027,26 +1566,19 @@ dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
-ext2-modules-2.6.18-5-amd64-di
-ext3-modules-2.6.18-4-amd64-di
-ext3-modules-2.6.18-5-amd64-di
+ext2-modules-2.6.18-6-amd64-di
+ext3-modules-2.6.18-6-amd64-di
 fdisk-udeb
 finish-install
-firewire-core-modules-2.6.18-4-amd64-di
-firewire-core-modules-2.6.18-5-amd64-di
-firmware-modules-2.6.18-4-amd64-di
-floppy-modules-2.6.18-4-amd64-di
-floppy-modules-2.6.18-5-amd64-di
+firewire-core-modules-2.6.18-6-amd64-di
+floppy-modules-2.6.18-6-amd64-di
 gnupg-udeb
 gpgv-udeb
 grub-installer
 gtk2-engines-udeb
-ipv6-modules-2.6.18-4-amd64-di
-ipv6-modules-2.6.18-5-amd64-di
-irda-modules-2.6.18-4-amd64-di
-irda-modules-2.6.18-5-amd64-di
-jfs-modules-2.6.18-4-amd64-di
-jfs-modules-2.6.18-5-amd64-di
+ipv6-modules-2.6.18-6-amd64-di
+irda-modules-2.6.18-6-amd64-di
+jfs-modules-2.6.18-6-amd64-di
 jfsutils-udeb
 klibc-utils-floppy-udeb
 libblkid1-udeb
@@ -2065,15 +1597,12 @@ libtextwrap1-udeb
 libusb-0.1-udeb
 libuuid1-udeb
 lilo-installer
-loop-aes-modules-2.6.18-4-amd64-di
-loop-aes-modules-2.6.18-5-amd64-di
-loop-modules-2.6.18-4-amd64-di
-loop-modules-2.6.18-5-amd64-di
+loop-aes-modules-2.6.18-6-amd64-di
+loop-modules-2.6.18-6-amd64-di
 lowmem
 lvm2-udeb
 lvmcfg-utils
-md-modules-2.6.18-4-amd64-di
-md-modules-2.6.18-5-amd64-di
+md-modules-2.6.18-6-amd64-di
 mdadm-udeb
 mdcfg-utils
 mii-diag-udeb
@@ -2084,26 +1613,19 @@ net-retriever
 netcfg
 network-console
 network-preseed
-nic-extra-modules-2.6.18-4-amd64-di
-nic-extra-modules-2.6.18-5-amd64-di
-nic-modules-2.6.18-4-amd64-di
-nic-modules-2.6.18-5-amd64-di
-nic-pcmcia-modules-2.6.18-4-amd64-di
-nic-pcmcia-modules-2.6.18-5-amd64-di
-nic-shared-modules-2.6.18-4-amd64-di
-nic-shared-modules-2.6.18-5-amd64-di
-nic-usb-modules-2.6.18-4-amd64-di
-nic-usb-modules-2.6.18-5-amd64-di
+nic-extra-modules-2.6.18-6-amd64-di
+nic-modules-2.6.18-6-amd64-di
+nic-pcmcia-modules-2.6.18-6-amd64-di
+nic-shared-modules-2.6.18-6-amd64-di
+nic-usb-modules-2.6.18-6-amd64-di
 nobootloader
-ntfs-modules-2.6.18-4-amd64-di
-ntfs-modules-2.6.18-5-amd64-di
+ntfs-modules-2.6.18-6-amd64-di
 ntfsprogs-udeb
 oldsys-preseed
 openssh-client-udeb
 openssh-server-udeb
 os-prober-udeb
-parport-modules-2.6.18-4-amd64-di
-parport-modules-2.6.18-5-amd64-di
+parport-modules-2.6.18-6-amd64-di
 partconf-find-partitions
 parted-udeb
 partman-auto
@@ -2126,45 +1648,31 @@ partman-target
 partman-xfs
 pciutils-udeb
 pcmcia-cs-udeb
-pcmcia-modules-2.6.18-4-amd64-di
-pcmcia-modules-2.6.18-5-amd64-di
-pcmcia-storage-modules-2.6.18-4-amd64-di
-pcmcia-storage-modules-2.6.18-5-amd64-di
+pcmcia-modules-2.6.18-6-amd64-di
+pcmcia-storage-modules-2.6.18-6-amd64-di
 pcmciautils-udeb
 pkgsel
-plip-modules-2.6.18-4-amd64-di
-plip-modules-2.6.18-5-amd64-di
-ppp-modules-2.6.18-4-amd64-di
-ppp-modules-2.6.18-5-amd64-di
+plip-modules-2.6.18-6-amd64-di
+ppp-modules-2.6.18-6-amd64-di
 ppp-udeb
 pwgen-udeb
-qnx4-modules-2.6.18-4-amd64-di
-qnx4-modules-2.6.18-5-amd64-di
-reiserfs-modules-2.6.18-4-amd64-di
-reiserfs-modules-2.6.18-5-amd64-di
+qnx4-modules-2.6.18-6-amd64-di
+reiserfs-modules-2.6.18-6-amd64-di
 rescue-mode
-sata-modules-2.6.18-4-amd64-di
-sata-modules-2.6.18-5-amd64-di
+sata-modules-2.6.18-6-amd64-di
 save-logs
-scsi-common-modules-2.6.18-4-amd64-di
-scsi-common-modules-2.6.18-5-amd64-di
-scsi-extra-modules-2.6.18-4-amd64-di
-scsi-extra-modules-2.6.18-5-amd64-di
-scsi-modules-2.6.18-4-amd64-di
-scsi-modules-2.6.18-5-amd64-di
-serial-modules-2.6.18-4-amd64-di
-serial-modules-2.6.18-5-amd64-di
+scsi-common-modules-2.6.18-6-amd64-di
+scsi-extra-modules-2.6.18-6-amd64-di
+scsi-modules-2.6.18-6-amd64-di
+serial-modules-2.6.18-6-amd64-di
 strace-udeb
 tzsetup-udeb
-ufs-modules-2.6.18-4-amd64-di
-ufs-modules-2.6.18-5-amd64-di
-usb-serial-modules-2.6.18-4-amd64-di
-usb-serial-modules-2.6.18-5-amd64-di
+ufs-modules-2.6.18-6-amd64-di
+usb-serial-modules-2.6.18-6-amd64-di
 usbutils-udeb
 user-setup-udeb
 wireless-tools-udeb
-xfs-modules-2.6.18-4-amd64-di
-xfs-modules-2.6.18-5-amd64-di
+xfs-modules-2.6.18-6-amd64-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_amd64 */
diff --git a/etchnhalf/tasks/task.list b/etchnhalf/tasks/task.list
index 6e2c49e6..3780a955 100644
--- a/etchnhalf/tasks/task.list
+++ b/etchnhalf/tasks/task.list
@@ -1,4 +1,3 @@
-# Main tasks
 gnome-desktop
 desktop
 web-server
@@ -8,178 +7,109 @@ print-server
 database-server
 dns-server
 file-server
-
-# Language tasks
-# Commented out means the language is currently not supported in D-I
 arabic
 arabic-desktop
-arabic-gnome-desktop
 basque-desktop
-basque-gnome-desktop
 belarusian
 belarusian-desktop
-belarusian-gnome-desktop
 bengali
 bengali-desktop
-bengali-gnome-desktop
 bosnian
 bosnian-desktop
-bosnian-gnome-desktop
 brazilian-portuguese
 brazilian-portuguese-desktop
-brazilian-portuguese-gnome-desktop
 bulgarian
 bulgarian-desktop
-bulgarian-gnome-desktop
 catalan
 catalan-desktop
-catalan-gnome-desktop
 chinese-s
 chinese-s-desktop
-chinese-s-gnome-desktop
 chinese-t
 chinese-t-desktop
-chinese-t-gnome-desktop
 croatian
 croatian-desktop
-croatian-gnome-desktop
 cyrillic
 cyrillic-desktop
-cyrillic-gnome-desktop
 czech
 czech-desktop
-czech-gnome-desktop
 danish
 danish-desktop
-danish-gnome-desktop
 dutch
 dutch-desktop
-dutch-gnome-desktop
 dzongkha-desktop
-dzongkha-gnome-desktop
 esperanto-desktop
-esperanto-gnome-desktop
 estonian-desktop
-estonian-gnome-desktop
 finnish
 finnish-desktop
-finnish-gnome-desktop
 french
 french-desktop
-french-gnome-desktop
 galician
 galician-desktop
-galician-gnome-desktop
 georgian-desktop
-georgian-gnome-desktop
 german
 german-desktop
-german-gnome-desktop
 greek
 greek-desktop
-greek-gnome-desktop
-gujarati-desktop
-gujarati-gnome-desktop
 hebrew
 hebrew-desktop
-hebrew-gnome-desktop
 hindi
 hindi-desktop
-hindi-gnome-desktop
 hungarian
 hungarian-desktop
-hungarian-gnome-desktop
-#icelandic
-#icelandic-desktop
-#icelandic-gnome-desktop
-#irish
-#irish-desktop
-#irish-gnome-desktop
+icelandic
+icelandic-desktop
+irish
+irish-desktop
 italian
 italian-desktop
-italian-gnome-desktop
 japanese
 japanese-desktop
-japanese-gnome-desktop
 khmer
 khmer-desktop
-khmer-gnome-desktop
 korean
 korean-desktop
-korean-gnome-desktop
 latvian-desktop
-latvian-gnome-desktop
 lithuanian
 lithuanian-desktop
-lithuanian-gnome-desktop
 macedonian
 macedonian-desktop
-macedonian-gnome-desktop
-malayalam-desktop
-malayalam-gnome-desktop
 nepali-desktop
-nepali-gnome-desktop
 northern-sami-desktop
-northern-sami-gnome-desktop
 norwegian
 norwegian-desktop
-norwegian-gnome-desktop
 persian
 persian-desktop
-persian-gnome-desktop
 polish
 polish-desktop
-polish-gnome-desktop
 portuguese
 portuguese-desktop
-portuguese-gnome-desktop
 punjabi
 punjabi-desktop
-punjabi-gnome-desktop
 romanian
 romanian-desktop
-romanian-gnome-desktop
 russian
 russian-desktop
-russian-gnome-desktop
-#serbian
-#serbian-desktop
-#serbian-gnome-desktop
+serbian
+serbian-desktop
 slovak
 slovak-desktop
-slovak-gnome-desktop
 slovenian
 slovenian-desktop
-slovenian-gnome-desktop
 spanish
 spanish-desktop
-spanish-gnome-desktop
 swedish
 swedish-desktop
-swedish-gnome-desktop
 tagalog
-tamil
 tamil-desktop
-tamil-gnome-desktop
 thai
 thai-desktop
-thai-gnome-desktop
 turkish
 turkish-desktop
-turkish-gnome-desktop
 ukrainian
 ukrainian-desktop
-ukrainian-gnome-desktop
 vietnamese-desktop
-vietnamese-gnome-desktop
-#welsh
-#welsh-desktop
-#welsh-gnome-desktop
-#xhosa-desktop
-#xhosa-gnome-desktop
-
-# Alternative desktop environments
+welsh
+welsh-desktop
+xhosa-desktop
 kde-desktop
-kde-gnome-desktop
 xfce-desktop
-xfce-gnome-desktop
diff --git a/etchnhalf/tasks/task.list.kde b/etchnhalf/tasks/task.list.kde
index 3a455964..a293af5d 100644
--- a/etchnhalf/tasks/task.list.kde
+++ b/etchnhalf/tasks/task.list.kde
@@ -1,173 +1,107 @@
-# Main tasks
 kde-desktop
 desktop
 laptop
-
-# Language tasks
-# Commented out means the language is currently not supported in D-I
 arabic
 arabic-desktop
-arabic-kde-desktop
 basque-desktop
-basque-kde-desktop
 belarusian
 belarusian-desktop
-belarusian-kde-desktop
 bengali
 bengali-desktop
-bengali-kde-desktop
 bosnian
 bosnian-desktop
-bosnian-kde-desktop
 brazilian-portuguese
 brazilian-portuguese-desktop
-brazilian-portuguese-kde-desktop
 bulgarian
 bulgarian-desktop
-bulgarian-kde-desktop
 catalan
 catalan-desktop
-catalan-kde-desktop
 chinese-s
 chinese-s-desktop
-chinese-s-kde-desktop
 chinese-t
 chinese-t-desktop
-chinese-t-kde-desktop
 croatian
 croatian-desktop
-croatian-kde-desktop
 cyrillic
 cyrillic-desktop
-cyrillic-kde-desktop
 czech
 czech-desktop
-czech-kde-desktop
 danish
 danish-desktop
-danish-kde-desktop
 dutch
 dutch-desktop
-dutch-kde-desktop
 dzongkha-desktop
-dzongkha-kde-desktop
 esperanto-desktop
-esperanto-kde-desktop
 estonian-desktop
-estonian-kde-desktop
 finnish
 finnish-desktop
-finnish-kde-desktop
 french
 french-desktop
-french-kde-desktop
 galician
 galician-desktop
-galician-kde-desktop
 georgian-desktop
-georgian-kde-desktop
 german
 german-desktop
-german-kde-desktop
 greek
 greek-desktop
-greek-kde-desktop
-gujarati-desktop
-gujarati-kde-desktop
 hebrew
 hebrew-desktop
-hebrew-kde-desktop
 hindi
 hindi-desktop
-hindi-kde-desktop
 hungarian
 hungarian-desktop
-hungarian-kde-desktop
-#icelandic
-#icelandic-desktop
-#icelandic-kde-desktop
-#irish
-#irish-desktop
-#irish-kde-desktop
+icelandic
+icelandic-desktop
+irish
+irish-desktop
 italian
 italian-desktop
-italian-kde-desktop
 japanese
 japanese-desktop
-japanese-kde-desktop
 khmer
 khmer-desktop
-khmer-kde-desktop
 korean
 korean-desktop
-korean-kde-desktop
 latvian-desktop
-latvian-kde-desktop
 lithuanian
 lithuanian-desktop
-lithuanian-kde-desktop
 macedonian
 macedonian-desktop
-macedonian-kde-desktop
-malayalam-desktop
-malayalam-kde-desktop
 nepali-desktop
-nepali-kde-desktop
 northern-sami-desktop
-northern-sami-kde-desktop
 norwegian
 norwegian-desktop
-norwegian-kde-desktop
 persian
 persian-desktop
-persian-kde-desktop
 polish
 polish-desktop
-polish-kde-desktop
 portuguese
 portuguese-desktop
-portuguese-kde-desktop
 punjabi
 punjabi-desktop
-punjabi-kde-desktop
 romanian
 romanian-desktop
-romanian-kde-desktop
 russian
 russian-desktop
-russian-kde-desktop
-#serbian
-#serbian-desktop
-#serbian-kde-desktop
+serbian
+serbian-desktop
 slovak
 slovak-desktop
-slovak-kde-desktop
 slovenian
 slovenian-desktop
-slovenian-kde-desktop
 spanish
 spanish-desktop
-spanish-kde-desktop
 swedish
 swedish-desktop
-swedish-kde-desktop
 tagalog
-tamil
 tamil-desktop
-tamil-kde-desktop
 thai
 thai-desktop
-thai-kde-desktop
 turkish
 turkish-desktop
-turkish-kde-desktop
 ukrainian
 ukrainian-desktop
-ukrainian-kde-desktop
 vietnamese-desktop
-vietnamese-kde-desktop
-#welsh
-#welsh-desktop
-#welsh-kde-desktop
-#xhosa-desktop
-#xhosa-kde-desktop
+welsh
+welsh-desktop
+xhosa-desktop
diff --git a/etchnhalf/tasks/task.list.xfce b/etchnhalf/tasks/task.list.xfce
index 0c2e3509..b36830da 100644
--- a/etchnhalf/tasks/task.list.xfce
+++ b/etchnhalf/tasks/task.list.xfce
@@ -1,173 +1,107 @@
-# Main tasks
 xfce-desktop
 desktop
 laptop
-
-# Language tasks
-# Commented out means the language is currently not supported in D-I
 arabic
 arabic-desktop
-arabic-xfce-desktop
 basque-desktop
-basque-xfce-desktop
 belarusian
 belarusian-desktop
-belarusian-xfce-desktop
 bengali
 bengali-desktop
-bengali-xfce-desktop
 bosnian
 bosnian-desktop
-bosnian-xfce-desktop
 brazilian-portuguese
 brazilian-portuguese-desktop
-brazilian-portuguese-xfce-desktop
 bulgarian
 bulgarian-desktop
-bulgarian-xfce-desktop
 catalan
 catalan-desktop
-catalan-xfce-desktop
 chinese-s
 chinese-s-desktop
-chinese-s-xfce-desktop
 chinese-t
 chinese-t-desktop
-chinese-t-xfce-desktop
 croatian
 croatian-desktop
-croatian-xfce-desktop
 cyrillic
 cyrillic-desktop
-cyrillic-xfce-desktop
 czech
 czech-desktop
-czech-xfce-desktop
 danish
 danish-desktop
-danish-xfce-desktop
 dutch
 dutch-desktop
-dutch-xfce-desktop
 dzongkha-desktop
-dzongkha-xfce-desktop
 esperanto-desktop
-esperanto-xfce-desktop
 estonian-desktop
-estonian-xfce-desktop
 finnish
 finnish-desktop
-finnish-xfce-desktop
 french
 french-desktop
-french-xfce-desktop
 galician
 galician-desktop
-galician-xfce-desktop
 georgian-desktop
-georgian-xfce-desktop
 german
 german-desktop
-german-xfce-desktop
 greek
 greek-desktop
-greek-xfce-desktop
-gujarati-desktop
-gujarati-xfce-desktop
 hebrew
 hebrew-desktop
-hebrew-xfce-desktop
 hindi
 hindi-desktop
-hindi-xfce-desktop
 hungarian
 hungarian-desktop
-hungarian-xfce-desktop
-#icelandic
-#icelandic-desktop
-#icelandic-xfce-desktop
-#irish
-#irish-desktop
-#irish-xfce-desktop
+icelandic
+icelandic-desktop
+irish
+irish-desktop
 italian
 italian-desktop
-italian-xfce-desktop
 japanese
 japanese-desktop
-japanese-xfce-desktop
 khmer
 khmer-desktop
-khmer-xfce-desktop
 korean
 korean-desktop
-korean-xfce-desktop
 latvian-desktop
-latvian-xfce-desktop
 lithuanian
 lithuanian-desktop
-lithuanian-xfce-desktop
 macedonian
 macedonian-desktop
-macedonian-xfce-desktop
-malayalam-desktop
-malayalam-xfce-desktop
 nepali-desktop
-nepali-xfce-desktop
 northern-sami-desktop
-northern-sami-xfce-desktop
 norwegian
 norwegian-desktop
-norwegian-xfce-desktop
 persian
 persian-desktop
-persian-xfce-desktop
 polish
 polish-desktop
-polish-xfce-desktop
 portuguese
 portuguese-desktop
-portuguese-xfce-desktop
 punjabi
 punjabi-desktop
-punjabi-xfce-desktop
 romanian
 romanian-desktop
-romanian-xfce-desktop
 russian
 russian-desktop
-russian-xfce-desktop
-#serbian
-#serbian-desktop
-#serbian-xfce-desktop
+serbian
+serbian-desktop
 slovak
 slovak-desktop
-slovak-xfce-desktop
 slovenian
 slovenian-desktop
-slovenian-xfce-desktop
 spanish
 spanish-desktop
-spanish-xfce-desktop
 swedish
 swedish-desktop
-swedish-xfce-desktop
 tagalog
-tamil
 tamil-desktop
-tamil-xfce-desktop
 thai
 thai-desktop
-thai-xfce-desktop
 turkish
 turkish-desktop
-turkish-xfce-desktop
 ukrainian
 ukrainian-desktop
-ukrainian-xfce-desktop
 vietnamese-desktop
-vietnamese-xfce-desktop
-#welsh
-#welsh-desktop
-#welsh-xfce-desktop
-#xhosa-desktop
-#xhosa-xfce-desktop
+welsh
+welsh-desktop
+xhosa-desktop