diff --git a/Makefile b/Makefile
index ea289d2e..af922a21 100755
--- a/Makefile
+++ b/Makefile
@@ -345,7 +345,9 @@ $(BDIR)/rawlist:
 # This is just a temporal solution, list2cds should be a little bit less
 # silly so that this is not needed. For more info have a look at
 # http://lists.debian.org/debian-cd/2004/debian-cd-200404/msg00093.html
+ifneq ($(INSTALLER_CD),1)
 	/bin/echo -e "mawk\nexim4-daemon-light\nunifont" >>$(BDIR)/rawlist
+endif
 ifdef FORCENONUSONCD1
 	$(Q)$(apt) cache dumpavail | \
 		grep-dctrl -FSection -n -sPackage -e '^(non-US|non-us)' - | \
diff --git a/data/sarge/yaboot/yaboot.conf b/data/sarge/yaboot/yaboot.conf
index e3b970bd..aa54efc6 100644
--- a/data/sarge/yaboot/yaboot.conf
+++ b/data/sarge/yaboot/yaboot.conf
@@ -102,3 +102,99 @@ image=/install/power4/vmlinux
 	initrd-size=8192
 	append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
 	read-only
+
+# ... and now massive clone-and-hack for 2.6 ...
+
+# Powerpc subarch 
+image=/install/powerpc/2.6/vmlinux
+	label=install-powerpc-2.6
+	alias=install-2.6
+	initrd=/install/powerpc/2.6/initrd.gz
+	append="devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+image=/install/powerpc/2.6/vmlinux
+	label=expert-powerpc-2.6
+	alias=expert-2.6
+	initrd=/install/powerpc/2.6/initrd.gz
+	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+# some machines have wonky framebuffer support
+image=/install/powerpc/2.6/vmlinux
+	label=install-safe-powerpc-2.6
+	alias=install-safe-2.6
+	initrd=/install/powerpc/2.6/initrd.gz
+	initrd-size=8192
+	append="devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only
+
+image=/install/powerpc/2.6/vmlinux
+	label=expert-safe-powerpc-2.6
+	alias=expert-safe-2.6
+	initrd=/install/powerpc/2.6/initrd.gz
+	initrd-size=8192
+	append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only
+
+# Power3 subarch
+image=/install/power3/2.6/vmlinux
+	label=install-power3-2.6
+	initrd=/install/power3/2.6/initrd.gz
+	append="devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+image=/install/power3/2.6/vmlinux
+	label=expert-power3-2.6
+	initrd=/install/power3/2.6/initrd.gz
+	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+# some machines have wonky framebuffer support
+image=/install/power3/2.6/vmlinux
+	label=install-safe-power3-2.6
+	initrd=/install/power3/2.6/initrd.gz
+	initrd-size=8192
+	append="devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only
+
+image=/install/power3/2.6/vmlinux
+	label=expert-safe-power3-2.6
+	initrd=/install/power3/2.6/initrd.gz
+	initrd-size=8192
+	append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only
+
+# Power 4 subarch
+image=/install/power4/2.6/vmlinux
+	label=install-power4-2.6
+	initrd=/install/power4/2.6/initrd.gz
+	append="devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+image=/install/power4/2.6/vmlinux
+	label=expert-power4-2.6
+	initrd=/install/power4/2.6/initrd.gz
+	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+# some machines have wonky framebuffer support
+image=/install/power4/2.6/vmlinux
+	label=install-safe-power4-2.6
+	initrd=/install/power4/2.6/initrd.gz
+	initrd-size=8192
+	append="devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only
+
+image=/install/power4/2.6/vmlinux
+	label=expert-safe-power4-2.6
+	initrd=/install/power4/2.6/initrd.gz
+	initrd-size=8192
+	append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only
diff --git a/debian/changelog b/debian/changelog
index 5024caf5..52c8bd47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -72,6 +72,10 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
     - Make fast_sums ignore md5sums of files not in the pool directory.
       Closes: #247889
     - Add support for sarge bootable mipsel cds (delo based), needs work.
+    - Fix the dirty workaround bug that was adding debs to businesscards.
+    - Add 2.6 support to powerpc cds.
+    - Add yaboot to powerpc netinst cds as debootstrap no longer adds it.
+    - Update boot-sparc not to depend on a kernel version.
   * Bdale Garbee
     - shorten the command line in post-boot-hppa for sarge, as palo can't
       handle a command line longer than 127 chars right now
diff --git a/tasks/debian-installer b/tasks/debian-installer
index 8fa1dd3b..fad3cd52 100644
--- a/tasks/debian-installer
+++ b/tasks/debian-installer
@@ -3,7 +3,7 @@
  * This list can be generated with the command:
  * ../tools/generate_di_list
  *
- * Last update: Tue Apr 13 14:22:09 MDT 2004
+ * Last update: Sun Jun  6 23:08:14 MDT 2004
  */
 #ifdef ARCH_alpha
 aboot-installer
@@ -37,8 +37,8 @@ discover-udeb
 discover1-data-udeb
 discover1-udeb
 discover2-data-udeb
-discover2-udeb
 e2fsprogs-udeb
+eject-udeb
 ethdetect
 evms-udeb
 ext3-modules-2.4.25-1-generic-di
@@ -56,13 +56,14 @@ jfs-modules-2.4.25-1-generic-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
-libc-udeb
+libc6.1-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
 libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
+libnss-dns-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -72,6 +73,9 @@ lvm2-udeb
 lvmcfg
 lvmcfg-utils
 md-modules-2.4.25-1-generic-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
 mkreiserfs-udeb
 net-retriever
 netcfg
@@ -81,17 +85,17 @@ nic-shared-modules-2.4.25-1-generic-di
 nobootloader
 os-prober
 parport-modules-2.4.25-1-generic-di
-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
@@ -148,13 +152,10 @@ discover-udeb
 discover1-data-udeb
 discover1-udeb
 discover2-data-udeb
-discover2-udeb
 e2fsprogs-udeb
+eject-udeb
 ethdetect
 evms-udeb
-ext3-modules-2.4.25-netwinder-di
-ext3-modules-2.4.25-riscpc-di
-ext3-modules-2.4.25-riscstation-di
 fat-modules-2.4.25-netwinder-di
 fat-modules-2.4.25-riscpc-di
 fat-modules-2.4.25-riscstation-di
@@ -166,13 +167,14 @@ iso-3166-udeb
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
-libc-udeb
+libc6-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
 libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
+libnss-dns-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -184,6 +186,9 @@ lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
+mdadm-udeb
+mdcfg
+mdcfg-utils
 mkreiserfs-udeb
 net-retriever
 netcfg
@@ -192,17 +197,18 @@ nic-modules-2.4.25-netwinder-di
 nic-shared-modules-2.4.25-netwinder-di
 nobootloader
 os-prober
-partconf
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
-partitioner
 partman
 partman-auto
 partman-basicfilesystems
 partman-basicmethods
+partman-ext2r0
 partman-ext3
+partman-jfs
 partman-lvm
+partman-md
 partman-partitioning
 partman-reiserfs
 partman-target
@@ -253,8 +259,8 @@ discover-udeb
 discover1-data-udeb
 discover1-udeb
 discover2-data-udeb
-discover2-udeb
 e2fsprogs-udeb
+eject-udeb
 ethdetect
 evms-udeb
 fbset-udeb
@@ -266,13 +272,14 @@ iso-3166-udeb
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
-libc-udeb
+libc6-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
 libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
+libnss-dns-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -281,6 +288,9 @@ lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
+mdadm-udeb
+mdcfg
+mdcfg-utils
 mkreiserfs-udeb
 net-retriever
 netcfg
@@ -289,17 +299,17 @@ nic-modules-2.4.25-64-di
 nobootloader
 os-prober
 palo-installer
-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-palo
 partman-partitioning
 partman-reiserfs
@@ -316,55 +326,13 @@ wireless-tools-udeb
 xfsprogs-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
-discover2-data-udeb
-e2fsprogs-udeb
-ethdetect
-fdisk-udeb
-hw-detect-full
-iso-3166-udeb
-libblkid1-udeb
-libc-udeb
-libparted1.6-udeb
-libreiserfs0.3-udeb
-libuuid1-udeb
-lowmem
-lvmcfg
-lvmcfg-utils
-net-retriever
-nobootloader
-parted-udeb
-partman-auto
-partman-basicfilesystems
-partman-basicmethods
-partman-ext3
-partman-lvm
-partman-partitioning
-partman-reiserfs
-partman-target
-partman-xfs
-prebaseconfig
-userdevfs
 #endif /* ARCH_hurd-i386 */
 #ifdef ARCH_i386
 archdetect
 autopartkit
 base-installer
 baseconfig-udeb
-brltty-modules-2.4.25-1-386-di
+brltty-modules-2.4.26-1-386-di
 brltty-udeb
 bterm-unifont
 bugreporter-udeb
@@ -381,80 +349,111 @@ debootstrap-udeb
 dhcp-client-udeb
 di-utils
 di-utils-mapdevfs
-discover1-data-udeb
-discover1-udeb
-discover2-data-udeb
-discover2-udeb
 e2fsprogs-udeb
+eject-udeb
 ethdetect
 evms-udeb
-ext3-modules-2.4.25-1-386-di
+ext3-modules-2.4.26-1-386-di
+ext3-modules-2.6.5-1-386-di
 fbset-udeb
 fdisk-udeb
 grub-installer
 hw-detect-full
-ipv6-modules-2.4.25-1-386-di
-irda-modules-2.4.25-1-386-di
+ipv6-modules-2.4.26-1-386-di
+ipv6-modules-2.6.5-1-386-di
+irda-modules-2.4.26-1-386-di
+irda-modules-2.6.5-1-386-di
 iso-3166-udeb
-jfs-modules-2.4.25-1-386-di
+jfs-modules-2.4.26-1-386-di
+jfs-modules-2.6.5-1-386-di
 jfsutils-udeb
 libblkid1-udeb
-libc-udeb
+libc6-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
 libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
+libnss-dns-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
 lilo-installer
-loop-modules-2.4.25-1-386-di
+loop-modules-2.4.26-1-386-di
+loop-modules-2.6.5-1-386-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.4.25-1-386-di
+md-modules-2.4.26-1-386-di
+md-modules-2.6.5-1-386-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
 mkreiserfs-udeb
 net-retriever
 netcfg
-nic-extra-modules-2.4.25-1-386-di
-nic-modules-2.4.25-1-386-di
-nic-pcmcia-modules-2.4.25-1-386-di
-nic-shared-modules-2.4.25-1-386-di
+nic-extra-modules-2.4.26-1-386-di
+nic-extra-modules-2.6.5-1-386-di
+nic-modules-2.4.26-1-386-di
+nic-modules-2.6.5-1-386-di
+nic-pcmcia-modules-2.4.26-1-386-di
+nic-pcmcia-modules-2.6.5-1-386-di
+nic-shared-modules-2.4.26-1-386-di
+nic-shared-modules-2.6.5-1-386-di
+nic-usb-modules-2.4.26-1-386-di
+nic-usb-modules-2.6.5-1-386-di
 nobootloader
-ntfs-modules-2.4.25-1-386-di
+ntfs-modules-2.4.26-1-386-di
+ntfs-modules-2.6.5-1-386-di
 os-prober
-parport-modules-2.4.25-1-386-di
+parport-modules-2.4.26-1-386-di
+parport-modules-2.6.5-1-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.25-1-386-di
-pcmcia-storage-modules-2.4.25-1-386-di
-plip-modules-2.4.25-1-386-di
-ppp-modules-2.4.25-1-386-di
+pcmcia-modules-2.4.26-1-386-di
+pcmcia-modules-2.6.5-1-386-di
+pcmcia-storage-modules-2.4.26-1-386-di
+pcmcia-storage-modules-2.6.5-1-386-di
+plip-modules-2.4.26-1-386-di
+plip-modules-2.6.5-1-386-di
+ppp-modules-2.4.26-1-386-di
+ppp-modules-2.6.5-1-386-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-reiserfs-modules-2.4.25-1-386-di
-scsi-common-modules-2.4.25-1-386-di
-scsi-extra-modules-2.4.25-1-386-di
-scsi-modules-2.4.25-1-386-di
-serial-modules-2.4.25-1-386-di
+reiserfs-modules-2.4.26-1-386-di
+reiserfs-modules-2.6.5-1-386-di
+sata-modules-2.4.26-1-386-di
+sata-modules-2.6.5-1-386-di
+scsi-common-modules-2.4.26-1-386-di
+scsi-common-modules-2.6.5-1-386-di
+scsi-extra-modules-2.4.26-1-386-di
+scsi-extra-modules-2.6.5-1-386-di
+scsi-modules-2.4.26-1-386-di
+scsi-modules-2.6.5-1-386-di
+serial-modules-2.4.26-1-386-di
+serial-modules-2.6.5-1-386-di
+ufs-modules-2.4.26-1-386-di
 wireless-tools-udeb
-xfs-modules-2.4.25-1-386-di
+xfs-modules-2.4.26-1-386-di
+xfs-modules-2.6.5-1-386-di
 xfsprogs-udeb
 #endif /* ARCH_i386 */
 #ifdef ARCH_ia64
@@ -487,9 +486,9 @@ discover-udeb
 discover1-data-udeb
 discover1-udeb
 discover2-data-udeb
-discover2-udeb
 e2fsprogs-udeb
 efi-reader
+eject-udeb
 elilo-installer
 ethdetect
 evms-udeb
@@ -508,13 +507,14 @@ iso-3166-udeb
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
-libc-udeb
+libc6.1-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
 libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
+libnss-dns-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -525,6 +525,9 @@ lvm2-udeb
 lvmcfg
 lvmcfg-utils
 md-modules-2.4.25-itanium-smp-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
 mkreiserfs-udeb
 net-retriever
 netcfg
@@ -532,17 +535,17 @@ nic-modules-2.4.25-itanium-smp-di
 nobootloader
 os-prober
 parport-modules-2.4.25-itanium-smp-di
-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
@@ -592,28 +595,47 @@ discover-udeb
 discover1-data-udeb
 discover1-udeb
 discover2-data-udeb
-discover2-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.25-amiga-di
+fat-modules-2.4.26-amiga-di
+fat-modules-2.4.26-atari-di
+fat-modules-2.4.26-bvme6000-di
+fat-modules-2.4.26-mvme147-di
+fat-modules-2.4.26-mvme16x-di
 fbset-udeb
 hw-detect-full
+ipv6-modules-2.2.25-atari-di
+ipv6-modules-2.2.25-bvme6000-di
 ipv6-modules-2.2.25-mac-di
+ipv6-modules-2.2.25-mvme147-di
+ipv6-modules-2.2.25-mvme16x-di
 ipv6-modules-2.4.25-amiga-di
 iso-3166-udeb
 jfs-modules-2.4.25-amiga-di
+jfs-modules-2.4.26-amiga-di
+jfs-modules-2.4.26-atari-di
+jfs-modules-2.4.26-bvme6000-di
+jfs-modules-2.4.26-mvme147-di
+jfs-modules-2.4.26-mvme16x-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
-libc-udeb
+libc6-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
 libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
+libnss-dns-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -623,11 +645,23 @@ lvm2-udeb
 lvmcfg
 lvmcfg-utils
 mac-fdisk-udeb
+mdadm-udeb
+mdcfg
+mdcfg-utils
 mkreiserfs-udeb
 net-retriever
 netcfg
+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.25-amiga-di
+nic-shared-modules-2.4.26-amiga-di
+nic-shared-modules-2.4.26-atari-di
+nic-shared-modules-2.4.26-bvme6000-di
+nic-shared-modules-2.4.26-mvme147-di
+nic-shared-modules-2.4.26-mvme16x-di
 nobootloader
 os-prober
 partconf
@@ -640,19 +674,45 @@ 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.25-amiga-di
+ppp-modules-2.4.26-amiga-di
+ppp-modules-2.4.26-atari-di
+ppp-modules-2.4.26-bvme6000-di
+ppp-modules-2.4.26-mvme147-di
+ppp-modules-2.4.26-mvme16x-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
 reiserfs-modules-2.4.25-amiga-di
+reiserfs-modules-2.4.26-amiga-di
+reiserfs-modules-2.4.26-atari-di
+reiserfs-modules-2.4.26-bvme6000-di
+reiserfs-modules-2.4.26-mvme147-di
+reiserfs-modules-2.4.26-mvme16x-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.25-amiga-di
+scsi-modules-2.4.26-amiga-di
+scsi-modules-2.4.26-atari-di
+scsi-modules-2.4.26-bvme6000-di
+scsi-modules-2.4.26-mvme147-di
+scsi-modules-2.4.26-mvme16x-di
 userdevfs
 wireless-tools-udeb
 xfsprogs-udeb
@@ -668,7 +728,7 @@ bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-cdrom-core-modules-2.4.22-sb1-swarm-bn-di
+cdrom-core-modules-2.4.25-sb1-swarm-bn-di
 choose-mirror
 console-keymaps-acorn
 console-keymaps-amiga
@@ -687,44 +747,47 @@ discover-udeb
 discover1-data-udeb
 discover1-udeb
 discover2-data-udeb
-discover2-udeb
 e2fsprogs-udeb
+eject-udeb
 ethdetect
 evms-udeb
-fat-modules-2.4.22-sb1-swarm-bn-di
+fat-modules-2.4.25-sb1-swarm-bn-di
 fbset-udeb
 fdisk-udeb
-hfs-modules-2.4.22-sb1-swarm-bn-di
 hw-detect-full
-ipv6-modules-2.4.22-r4k-ip22-di
-ipv6-modules-2.4.22-r5k-ip22-di
-ipv6-modules-2.4.22-sb1-swarm-bn-di
+ipv6-modules-2.4.25-r4k-ip22-di
+ipv6-modules-2.4.25-r5k-ip22-di
+ipv6-modules-2.4.25-sb1-swarm-bn-di
 iso-3166-udeb
-jfs-modules-2.4.22-r4k-ip22-di
-jfs-modules-2.4.22-r5k-ip22-di
-jfs-modules-2.4.22-sb1-swarm-bn-di
+jfs-modules-2.4.25-r4k-ip22-di
+jfs-modules-2.4.25-r5k-ip22-di
+jfs-modules-2.4.25-sb1-swarm-bn-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
-libc-udeb
+libc6-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
 libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
+libnss-dns-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
-loop-modules-2.4.22-sb1-swarm-bn-di
+loop-modules-2.4.25-sb1-swarm-bn-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.4.22-r4k-ip22-di
-md-modules-2.4.22-r5k-ip22-di
-md-modules-2.4.22-sb1-swarm-bn-di
+md-modules-2.4.25-r4k-ip22-di
+md-modules-2.4.25-r5k-ip22-di
+md-modules-2.4.25-sb1-swarm-bn-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
 mkreiserfs-udeb
 net-retriever
 netcfg
@@ -740,25 +803,25 @@ 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.4.19-r4k-ip22-udeb
-ppp-modules-2.4.22-r4k-ip22-di
-ppp-modules-2.4.22-r5k-ip22-di
-ppp-modules-2.4.22-sb1-swarm-bn-di
+ppp-modules-2.4.25-sb1-swarm-bn-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-reiserfs-modules-2.4.22-r4k-ip22-di
-reiserfs-modules-2.4.22-r5k-ip22-di
-reiserfs-modules-2.4.22-sb1-swarm-bn-di
-scsi-core-modules-2.4.22-sb1-swarm-bn-di
-socket-modules-2.4.22-sb1-swarm-bn-di
-usb-storage-modules-2.4.22-sb1-swarm-bn-di
+reiserfs-modules-2.4.25-r4k-ip22-di
+reiserfs-modules-2.4.25-r5k-ip22-di
+reiserfs-modules-2.4.25-sb1-swarm-bn-di
+scsi-core-modules-2.4.25-sb1-swarm-bn-di
+socket-modules-2.4.25-sb1-swarm-bn-di
+usb-storage-modules-2.4.25-sb1-swarm-bn-di
 userdevfs
 wireless-tools-udeb
 xfsprogs-udeb
@@ -773,7 +836,10 @@ bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
+cdrom-core-modules-2.4.25-r5k-cobalt-di
+cdrom-core-modules-2.4.25-sb1-swarm-bn-di
 choose-mirror
+colo-installer
 console-keymaps-acorn
 console-keymaps-amiga
 console-keymaps-at
@@ -792,68 +858,91 @@ discover-udeb
 discover1-data-udeb
 discover1-udeb
 discover2-data-udeb
-discover2-udeb
 e2fsprogs-udeb
+eject-udeb
 ethdetect
 evms-udeb
+fat-modules-2.4.25-r5k-cobalt-di
+fat-modules-2.4.25-sb1-swarm-bn-di
 fbset-udeb
 fdisk-udeb
 hw-detect-full
-ipv6-modules-2.4.19-r3k-kn02-di
-ipv6-modules-2.4.19-r4k-kn04-di
+ipv6-modules-2.4.25-r3k-kn02-di
+ipv6-modules-2.4.25-r4k-kn04-di
+ipv6-modules-2.4.25-r5k-cobalt-di
+ipv6-modules-2.4.25-sb1-swarm-bn-di
 iso-3166-udeb
+jfs-modules-2.4.25-r5k-cobalt-di
+jfs-modules-2.4.25-sb1-swarm-bn-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
-libc-udeb
+libc6-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
 libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
+libnss-dns-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
+loop-modules-2.4.25-r5k-cobalt-di
+loop-modules-2.4.25-sb1-swarm-bn-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.4.19-r3k-kn02-di
-md-modules-2.4.19-r4k-kn04-di
+md-modules-2.4.25-r3k-kn02-di
+md-modules-2.4.25-r4k-kn04-di
+md-modules-2.4.25-r5k-cobalt-di
+md-modules-2.4.25-sb1-swarm-bn-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
 mkreiserfs-udeb
 net-retriever
 netcfg
 nobootloader
 os-prober
-partconf
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
-partitioner
 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-modules-2.4.19-r3k-kn02-di
 ppp-modules-2.4.19-r3k-kn02-udeb
-ppp-modules-2.4.19-r4k-kn04-di
 ppp-modules-2.4.19-r4k-kn04-udeb
+ppp-modules-2.4.25-r3k-kn02-di
+ppp-modules-2.4.25-r4k-kn04-di
+ppp-modules-2.4.25-r5k-cobalt-di
+ppp-modules-2.4.25-sb1-swarm-bn-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-reiserfs-modules-2.4.19-r3k-kn02-di
-reiserfs-modules-2.4.19-r4k-kn04-di
+reiserfs-modules-2.4.25-r3k-kn02-di
+reiserfs-modules-2.4.25-r4k-kn04-di
+reiserfs-modules-2.4.25-r5k-cobalt-di
+reiserfs-modules-2.4.25-sb1-swarm-bn-di
+scsi-core-modules-2.4.25-sb1-swarm-bn-di
+socket-modules-2.4.25-sb1-swarm-bn-di
+usb-storage-modules-2.4.25-sb1-swarm-bn-di
 userdevfs
 wireless-tools-udeb
+xfs-modules-2.4.25-r5k-cobalt-di
 xfsprogs-udeb
 #endif /* ARCH_mipsel */
 #ifdef ARCH_powerpc
@@ -861,10 +950,17 @@ affs-modules-2.4.25-power3-di
 affs-modules-2.4.25-power4-di
 affs-modules-2.4.25-powerpc-di
 affs-modules-2.4.25-powerpc-small-di
+affs-modules-2.6.6-g5-di
+affs-modules-2.6.6-power3-di
+affs-modules-2.6.6-power4-di
+affs-modules-2.6.6-powerpc-di
 archdetect
 autopartkit
 base-installer
 baseconfig-udeb
+brltty-modules-2.4.25-power3-di
+brltty-modules-2.4.25-power4-di
+brltty-modules-2.4.25-powerpc-di
 brltty-modules-2.4.25-powerpc-small-di
 brltty-udeb
 bterm-unifont
@@ -872,6 +968,10 @@ bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
 cdrom-core-modules-2.4.25-powerpc-small-di
+cdrom-core-modules-2.6.6-g5-di
+cdrom-core-modules-2.6.6-power3-di
+cdrom-core-modules-2.6.6-power4-di
+cdrom-core-modules-2.6.6-powerpc-di
 choose-mirror
 console-keymaps-acorn
 console-keymaps-amiga
@@ -890,50 +990,121 @@ discover-udeb
 discover1-data-udeb
 discover1-udeb
 discover2-data-udeb
-discover2-udeb
 e2fsprogs-udeb
+eject-udeb
 ethdetect
 evms-udeb
+ext2-modules-2.6.6-g5-di
+ext2-modules-2.6.6-power3-di
+ext2-modules-2.6.6-power4-di
+ext2-modules-2.6.6-powerpc-di
 ext3-modules-2.4.25-powerpc-small-di
+ext3-modules-2.6.6-g5-di
+ext3-modules-2.6.6-power3-di
+ext3-modules-2.6.6-power4-di
+ext3-modules-2.6.6-powerpc-di
 fat-modules-2.4.25-power3-di
 fat-modules-2.4.25-power4-di
+fat-modules-2.6.6-g5-di
+fat-modules-2.6.6-power3-di
+fat-modules-2.6.6-power4-di
+fat-modules-2.6.6-powerpc-di
+fb-modules-2.4.25-power3-di
+fb-modules-2.4.25-power4-di
+fb-modules-2.4.25-powerpc-di
 fb-modules-2.4.25-powerpc-small-di
 fbset-udeb
 fdisk-udeb
 firewire-core-modules-2.4.25-powerpc-small-di
+firewire-core-modules-2.6.6-g5-di
+firewire-core-modules-2.6.6-power3-di
+firewire-core-modules-2.6.6-power4-di
+firewire-core-modules-2.6.6-powerpc-di
+floppy-modules-2.4.25-power3-di
+floppy-modules-2.4.25-power4-di
+floppy-modules-2.4.25-powerpc-di
 floppy-modules-2.4.25-powerpc-small-di
+floppy-modules-2.6.6-g5-di
+floppy-modules-2.6.6-power3-di
+floppy-modules-2.6.6-power4-di
+floppy-modules-2.6.6-powerpc-di
+fs-common-modules-2.6.6-g5-di
+fs-common-modules-2.6.6-power3-di
+fs-common-modules-2.6.6-power4-di
+fs-common-modules-2.6.6-powerpc-di
 hfs-modules-2.4.25-power3-di
 hfs-modules-2.4.25-power4-di
 hfs-modules-2.4.25-powerpc-di
 hfs-modules-2.4.25-powerpc-small-di
+hfs-modules-2.6.6-g5-di
+hfs-modules-2.6.6-power3-di
+hfs-modules-2.6.6-power4-di
+hfs-modules-2.6.6-powerpc-di
 hw-detect-full
 ide-modules-2.4.25-apus-di
 ide-modules-2.4.25-power3-di
 ide-modules-2.4.25-power4-di
 ide-modules-2.4.25-powerpc-di
 ide-modules-2.4.25-powerpc-small-di
+ide-modules-2.6.6-g5-di
+ide-modules-2.6.6-power3-di
+ide-modules-2.6.6-power4-di
+ide-modules-2.6.6-powerpc-di
 input-modules-2.4.25-apus-di
 input-modules-2.4.25-powerpc-small-di
+input-modules-2.6.6-g5-di
+input-modules-2.6.6-power3-di
+input-modules-2.6.6-power4-di
+input-modules-2.6.6-powerpc-di
+ipv6-modules-2.4.25-power3-di
+ipv6-modules-2.4.25-power4-di
+ipv6-modules-2.4.25-powerpc-di
 ipv6-modules-2.4.25-powerpc-small-di
+ipv6-modules-2.6.6-g5-di
+ipv6-modules-2.6.6-power3-di
+ipv6-modules-2.6.6-power4-di
+ipv6-modules-2.6.6-powerpc-di
+irda-modules-2.4.25-power3-di
+irda-modules-2.4.25-power4-di
+irda-modules-2.4.25-powerpc-di
 irda-modules-2.4.25-powerpc-small-di
+irda-modules-2.6.6-g5-di
+irda-modules-2.6.6-power3-di
+irda-modules-2.6.6-power4-di
+irda-modules-2.6.6-powerpc-di
+isa-pnp-modules-2.4.25-power3-di
+isa-pnp-modules-2.4.25-power4-di
+isa-pnp-modules-2.4.25-powerpc-di
 isa-pnp-modules-2.4.25-powerpc-small-di
 iso-3166-udeb
 jfs-modules-2.4.25-apus-di
 jfs-modules-2.4.25-powerpc-small-di
+jfs-modules-2.6.6-g5-di
+jfs-modules-2.6.6-power3-di
+jfs-modules-2.6.6-power4-di
+jfs-modules-2.6.6-powerpc-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
-libc-udeb
+libc6-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
 libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
+libnss-dns-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
+loop-modules-2.4.25-power3-di
+loop-modules-2.4.25-power4-di
+loop-modules-2.4.25-powerpc-di
 loop-modules-2.4.25-powerpc-small-di
+loop-modules-2.6.6-g5-di
+loop-modules-2.6.6-power3-di
+loop-modules-2.6.6-power4-di
+loop-modules-2.6.6-powerpc-di
 lowmem
 lvm10-udeb
 lvm2-udeb
@@ -941,7 +1112,17 @@ lvmcfg
 lvmcfg-utils
 mac-fdisk-udeb
 md-modules-2.4.25-apus-di
+md-modules-2.4.25-power3-di
+md-modules-2.4.25-power4-di
+md-modules-2.4.25-powerpc-di
 md-modules-2.4.25-powerpc-small-di
+md-modules-2.6.6-g5-di
+md-modules-2.6.6-power3-di
+md-modules-2.6.6-power4-di
+md-modules-2.6.6-powerpc-di
+mdadm-udeb
+mdcfg
+mdcfg-utils
 mkreiserfs-udeb
 net-retriever
 netcfg
@@ -949,38 +1130,81 @@ nic-extra-modules-2.4.25-power3-di
 nic-extra-modules-2.4.25-power4-di
 nic-extra-modules-2.4.25-powerpc-di
 nic-extra-modules-2.4.25-powerpc-small-di
+nic-extra-modules-2.6.6-g5-di
+nic-extra-modules-2.6.6-power3-di
+nic-extra-modules-2.6.6-power4-di
+nic-extra-modules-2.6.6-powerpc-di
 nic-modules-2.4.25-apus-di
 nic-modules-2.4.25-power3-di
 nic-modules-2.4.25-power4-di
 nic-modules-2.4.25-powerpc-di
 nic-modules-2.4.25-powerpc-small-di
+nic-modules-2.6.6-g5-di
+nic-modules-2.6.6-power3-di
+nic-modules-2.6.6-power4-di
+nic-modules-2.6.6-powerpc-di
+nic-pcmcia-modules-2.4.25-power3-di
+nic-pcmcia-modules-2.4.25-power4-di
+nic-pcmcia-modules-2.4.25-powerpc-di
 nic-pcmcia-modules-2.4.25-powerpc-small-di
+nic-pcmcia-modules-2.6.5-power3-di
+nic-pcmcia-modules-2.6.5-power4-di
+nic-pcmcia-modules-2.6.5-powerpc-di
+nic-pcmcia-modules-2.6.6-g5-di
+nic-pcmcia-modules-2.6.6-power3-di
+nic-pcmcia-modules-2.6.6-power4-di
+nic-pcmcia-modules-2.6.6-powerpc-di
 nic-shared-modules-2.4.25-power3-di
 nic-shared-modules-2.4.25-power4-di
 nic-shared-modules-2.4.25-powerpc-di
 nic-shared-modules-2.4.25-powerpc-small-di
+nic-shared-modules-2.6.6-g5-di
+nic-shared-modules-2.6.6-power3-di
+nic-shared-modules-2.6.6-power4-di
+nic-shared-modules-2.6.6-powerpc-di
 nobootloader
 os-prober
 parport-modules-2.4.25-apus-di
 parport-modules-2.4.25-powerpc-small-di
-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-newworld
 partman-partitioning
 partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
+pcmcia-modules-2.4.25-power3-di
+pcmcia-modules-2.4.25-power4-di
+pcmcia-modules-2.4.25-powerpc-di
 pcmcia-modules-2.4.25-powerpc-small-di
+pcmcia-modules-2.6.5-power3-di
+pcmcia-modules-2.6.5-power4-di
+pcmcia-modules-2.6.5-powerpc-di
+pcmcia-modules-2.6.6-g5-di
+pcmcia-modules-2.6.6-power3-di
+pcmcia-modules-2.6.6-power4-di
+pcmcia-modules-2.6.6-powerpc-di
+pcmcia-storage-modules-2.4.25-power3-di
+pcmcia-storage-modules-2.4.25-power4-di
+pcmcia-storage-modules-2.4.25-powerpc-di
+pcmcia-storage-modules-2.4.25-powerpc-small-di
+pcmcia-storage-modules-2.6.5-power3-di
+pcmcia-storage-modules-2.6.5-power4-di
+pcmcia-storage-modules-2.6.5-powerpc-di
+pcmcia-storage-modules-2.6.6-g5-di
+pcmcia-storage-modules-2.6.6-power3-di
+pcmcia-storage-modules-2.6.6-power4-di
+pcmcia-storage-modules-2.6.6-powerpc-di
 plip-modules-2.4.25-apus-di
 plip-modules-2.4.25-power3-di
 plip-modules-2.4.25-power4-di
@@ -991,35 +1215,94 @@ ppp-modules-2.4.25-power3-di
 ppp-modules-2.4.25-power4-di
 ppp-modules-2.4.25-powerpc-di
 ppp-modules-2.4.25-powerpc-small-di
+ppp-modules-2.6.6-g5-di
+ppp-modules-2.6.6-power3-di
+ppp-modules-2.6.6-power4-di
+ppp-modules-2.6.6-powerpc-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
 reiserfs-modules-2.4.25-powerpc-small-di
+reiserfs-modules-2.6.6-g5-di
+reiserfs-modules-2.6.6-power3-di
+reiserfs-modules-2.6.6-power4-di
+reiserfs-modules-2.6.6-powerpc-di
+sata-modules-2.6.6-g5-di
+sata-modules-2.6.6-power3-di
+sata-modules-2.6.6-power4-di
+sata-modules-2.6.6-powerpc-di
 scsi-common-modules-2.4.25-power3-di
 scsi-common-modules-2.4.25-power4-di
 scsi-common-modules-2.4.25-powerpc-di
 scsi-common-modules-2.4.25-powerpc-small-di
+scsi-common-modules-2.6.6-g5-di
+scsi-common-modules-2.6.6-power3-di
+scsi-common-modules-2.6.6-power4-di
+scsi-common-modules-2.6.6-powerpc-di
 scsi-core-modules-2.4.25-powerpc-small-di
+scsi-core-modules-2.6.6-g5-di
+scsi-core-modules-2.6.6-power3-di
+scsi-core-modules-2.6.6-power4-di
+scsi-core-modules-2.6.6-powerpc-di
 scsi-extra-modules-2.4.25-powerpc-small-di
+scsi-extra-modules-2.6.6-g5-di
+scsi-extra-modules-2.6.6-power3-di
+scsi-extra-modules-2.6.6-power4-di
+scsi-extra-modules-2.6.6-powerpc-di
 scsi-modules-2.4.25-apus-di
 scsi-modules-2.4.25-power3-di
 scsi-modules-2.4.25-power4-di
 scsi-modules-2.4.25-powerpc-di
 scsi-modules-2.4.25-powerpc-small-di
+scsi-modules-2.6.6-g5-di
+scsi-modules-2.6.6-power3-di
+scsi-modules-2.6.6-power4-di
+scsi-modules-2.6.6-powerpc-di
 serial-modules-2.4.25-powerpc-di
 serial-modules-2.4.25-powerpc-small-di
+serial-modules-2.6.6-g5-di
+serial-modules-2.6.6-power3-di
+serial-modules-2.6.6-power4-di
+serial-modules-2.6.6-powerpc-di
 socket-modules-2.4.25-power3-di
 socket-modules-2.4.25-power4-di
 socket-modules-2.4.25-powerpc-di
 socket-modules-2.4.25-powerpc-small-di
+socket-modules-2.6.6-g5-di
+socket-modules-2.6.6-power3-di
+socket-modules-2.6.6-power4-di
+socket-modules-2.6.6-powerpc-di
+ufs-modules-2.4.25-power3-di
+ufs-modules-2.4.25-power4-di
+ufs-modules-2.4.25-powerpc-di
+ufs-modules-2.4.25-powerpc-small-di
+ufs-modules-2.6.6-g5-di
+ufs-modules-2.6.6-power3-di
+ufs-modules-2.6.6-power4-di
+ufs-modules-2.6.6-powerpc-di
 usb-modules-2.4.25-power3-di
 usb-modules-2.4.25-power4-di
 usb-modules-2.4.25-powerpc-di
 usb-modules-2.4.25-powerpc-small-di
+usb-modules-2.6.6-g5-di
+usb-modules-2.6.6-power3-di
+usb-modules-2.6.6-power4-di
+usb-modules-2.6.6-powerpc-di
+usb-storage-modules-2.4.25-power3-di
+usb-storage-modules-2.4.25-power4-di
+usb-storage-modules-2.4.25-powerpc-di
 usb-storage-modules-2.4.25-powerpc-small-di
+usb-storage-modules-2.6.6-g5-di
+usb-storage-modules-2.6.6-power3-di
+usb-storage-modules-2.6.6-power4-di
+usb-storage-modules-2.6.6-powerpc-di
 userdevfs
 wireless-tools-udeb
 xfs-modules-2.4.25-powerpc-small-di
+xfs-modules-2.6.6-g5-di
+xfs-modules-2.6.6-power3-di
+xfs-modules-2.6.6-power4-di
+xfs-modules-2.6.6-powerpc-di
 xfsprogs-udeb
 yaboot-installer
 #endif /* ARCH_powerpc */
@@ -1051,25 +1334,25 @@ discover-udeb
 discover1-data-udeb
 discover1-udeb
 discover2-data-udeb
-discover2-udeb
 e2fsprogs-udeb
+eject-udeb
 ethdetect
 evms-udeb
 fbset-udeb
 fdisk-udeb
 hw-detect-full
-ipv6-modules-2.4.19-s390-udeb
 iso-3166-udeb
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
-libc-udeb
+libc6-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
 libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
+libnss-dns-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -1078,9 +1361,11 @@ lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
+mdadm-udeb
+mdcfg
+mdcfg-utils
 mkreiserfs-udeb
 net-retriever
-nic-modules-2.4.19-s390-udeb
 nic-modules-2.4.21-1-s390-di
 nic-modules-2.4.25-1-s390-di
 nobootloader
@@ -1095,7 +1380,9 @@ partman-auto
 partman-basicfilesystems
 partman-basicmethods
 partman-ext3
+partman-jfs
 partman-lvm
+partman-md
 partman-partitioning
 partman-reiserfs
 partman-target
@@ -1124,8 +1411,9 @@ bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-cdrom-core-modules-2.4.24-sparc32-di
 cdrom-core-modules-2.4.24-sparc64-di
+cdrom-core-modules-2.4.26-sparc32-di
+cdrom-core-modules-2.4.26-sparc64-di
 choose-mirror
 console-keymaps-acorn
 console-keymaps-amiga
@@ -1144,25 +1432,28 @@ discover-udeb
 discover1-data-udeb
 discover1-udeb
 discover2-data-udeb
-discover2-udeb
 e2fsprogs-udeb
+eject-udeb
 ethdetect
 evms-udeb
 fbset-udeb
 hw-detect-full
 ipv6-modules-2.4.24-sparc32-di
 ipv6-modules-2.4.24-sparc64-di
+ipv6-modules-2.4.26-sparc32-di
+ipv6-modules-2.4.26-sparc64-di
 iso-3166-udeb
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
-libc-udeb
+libc6-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
 libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
+libnss-dns-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -1171,22 +1462,31 @@ lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
+mdadm-udeb
+mdcfg
+mdcfg-utils
 mkreiserfs-udeb
 net-retriever
 netcfg
+nic-pci-modules-2.4.24-sparc64-di
+nic-pci-modules-2.4.26-sparc64-di
+nic-sbus-modules-2.4.24-sparc32-di
+nic-sbus-modules-2.4.24-sparc64-di
+nic-sbus-modules-2.4.26-sparc32-di
+nic-sbus-modules-2.4.26-sparc64-di
 nobootloader
 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
@@ -1194,6 +1494,8 @@ partman-xfs
 pcmcia-cs-udeb
 ppp-modules-2.4.24-sparc32-di
 ppp-modules-2.4.24-sparc64-di
+ppp-modules-2.4.26-sparc32-di
+ppp-modules-2.4.26-sparc64-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
@@ -1203,37 +1505,4 @@ wireless-tools-udeb
 xfsprogs-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
-discover2-data-udeb
-ethdetect
-hw-detect-full
-iso-3166-udeb
-lowmem
-lvmcfg
-lvmcfg-utils
-net-retriever
-nobootloader
-partman-auto
-partman-basicfilesystems
-partman-basicmethods
-partman-ext3
-partman-lvm
-partman-partitioning
-partman-reiserfs
-partman-target
-partman-xfs
-prebaseconfig
-userdevfs
 #endif /* ARCH_sh */
diff --git a/tasks/debian-installer+kernel b/tasks/debian-installer+kernel
index fb6ff6a9..cd439fb6 100644
--- a/tasks/debian-installer+kernel
+++ b/tasks/debian-installer+kernel
@@ -5,13 +5,17 @@
  * This list can be generated with the command:
  * ../tools/generate_di+k_list
  *
- * Last update: Tue Apr 13 14:22:10 MDT 2004
+ * Last update: Sun Jun  6 23:08:15 MDT 2004
  */
 
 #include <debian-installer>
 eject
 locales
 lvm10
+libdevmapper1.00
+lvm-common
+lvm2
+mdadm
 aptitude
 jfbterm
 unifont
@@ -22,14 +26,16 @@ console-terminus
 pcmcia-cs
 wireless-tools
 xfsprogs
+jfsutils
 reiserfsprogs
 #ifdef ARCH_i386
 discover
 discover1
 grub
 lilo
-kernel-image-2.4.25-1-386
-kernel-pcmcia-modules-2.4.25-1-386
+kernel-image-2.4.26-1-386
+kernel-pcmcia-modules-2.4.26-1-386
+kernel-image-2.6.6-1-386
 #endif
 #ifdef ARCH_alpha
 discover1
@@ -37,37 +43,43 @@ kernel-image-2.4-generic
 kernel-image-2.4-smp
 kernel-image-2.4.25-1-generic
 kernel-image-2.4.25-1-smp
+kernel-image-2.4.26-1-generic
+kernel-image-2.4.26-1-smp
 kernel-image-2.6-generic
 kernel-image-2.6-smp
-kernel-image-2.6.3-1-generic
-kernel-image-2.6.3-1-smp
+kernel-image-2.6.5-1-generic
+kernel-image-2.6.5-1-smp
+kernel-image-2.6.6-1-generic
+kernel-image-2.6.6-1-smp
+kernel-image-netbootable
 #endif
 #ifdef ARCH_hppa
 discover1
-kernel-image-2.4.25-32
-kernel-image-2.4.25-32-smp
-kernel-image-2.4.25-64
-kernel-image-2.4.25-64-smp
+kernel-image-2.4.26-32-smp
+kernel-image-2.4.26-64
+kernel-image-2.4.26-64-smp
+kernel-image-netbootable
 #endif
 #ifdef ARCH_ia64
 discover1
 initrd-tools
-kernel-image-2.6.3-itanium
-kernel-image-2.6.3-itanium-smp
-kernel-image-2.6.3-mckinley
-kernel-image-2.6.3-mckinley-smp
+kernel-image-2.4.25-itanium
+kernel-image-2.4.25-itanium-smp
+kernel-image-2.4.25-mckinley
+kernel-image-2.4.25-mckinley-smp
 #endif
 #ifdef ARCH_mips
 arcboot
-kernel-image-2.4.22-r4k-ip22
-kernel-image-2.4.22-r5k-ip22
+kernel-image-2.4.26-r4k-ip22
+kernel-image-2.4.26-r5k-ip22
 #endif
 #ifdef ARCH_mipsel
-kernel-image-2.4.19-r3k-kn02
-kernel-image-2.4.19-r4k-kn04
+kernel-image-2.4.26-r3k-kn02
+kernel-image-2.4.26-r4k-kn04
 #endif
 #ifdef ARCH_powerpc
 discover1
+yaboot
 kernel-image-2.4.25-powerpc-pmac
 kernel-image-2.4.25-powerpc-small-pmac
 kernel-image-2.4.25-powerpc-prep
@@ -77,17 +89,17 @@ kernel-image-2.4.25-apus
 #endif
 #ifdef ARCH_sparc
 discover1
-kernel-image-2.4.24-sparc32
-kernel-image-2.4.24-sparc32-smp
-kernel-image-2.4.24-sparc64
-kernel-image-2.4.24-sparc64-smp
+initrd-tools
+kernel-image-2.4.26-sparc32
+kernel-image-2.4.26-sparc32-smp
+kernel-image-2.4.26-sparc64
+kernel-image-2.4.26-sparc64-smp
 #endif
 #ifdef ARCH_m68k
-kernel-image-2.2.25-amiga
-kernel-image-2.2.25-atari
-kernel-image-2.2.25-bvme6000
 kernel-image-2.2.25-mac
-kernel-image-2.2.25-mvme147
-kernel-image-2.2.25-mvme16x
-kernel-image-2.4.25-amiga
+kernel-image-2.4.26-amiga
+kernel-image-2.4.26-atari
+kernel-image-2.4.26-bvme6000
+kernel-image-2.4.26-mvme147
+kernel-image-2.4.26-mvme16x
 #endif
diff --git a/tools/boot/sarge/boot-powerpc b/tools/boot/sarge/boot-powerpc
index 6610aab0..bbdf0158 100755
--- a/tools/boot/sarge/boot-powerpc
+++ b/tools/boot/sarge/boot-powerpc
@@ -67,16 +67,15 @@ cp $BASEDIR/data/sarge/yaboot/ofboot.b ofboot.b
 
 for subarch in powerpc power3 power4
 do
-  mkdir $subarch
   if [ ! "$DI_WWW_HOME" ];then
 	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$subarch/cdrom"
   else
 	DI_DIR="di_stuff"
-	mkdir "$DI_DIR"
-	wget -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME/$subarch/cdrom/"
+	wget -r -nd --no-parent --level=1 -P "$DI_DIR" "$DI_WWW_HOME/$subarch/cdrom/"
+	wget -r -nd --no-parent --level=1 -P "$DI_DIR/2.6" "$DI_WWW_HOME/$subarch/cdrom/2.6/"
+	rm -f "$DI_DIR"/index* "$DI_DIR/2.6"/index*
   fi
-  cp "$DI_DIR"/vmlinu* "$subarch"
-  cp "$DI_DIR"/initrd.gz "$subarch"
+  cp -a "$DI_DIR" "$subarch"
   rm -rf di_stuff
 done
 
diff --git a/tools/boot/sarge/boot-sparc b/tools/boot/sarge/boot-sparc
index a31037ad..b8bdf3b2 100755
--- a/tools/boot/sarge/boot-sparc
+++ b/tools/boot/sarge/boot-sparc
@@ -52,12 +52,16 @@ cat $BASEDIR/data/sarge/sparc/debian.txt \
 # uncompress it before hand.
 
 if [ ! "$DI_WWW_HOME" ];then
-	cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/initrd.gz" "$inst/boot/initrd.gz"
-	cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/vmlinuz-2.4.24-sparc32" "$inst/boot/sparc32"
-	zcat "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/vmlinuz-2.4.24-sparc64" > "$inst/boot/sparc64"
+	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
 else
-	wget "$DI_WWW_HOME/initrd.gz" -O "$inst/boot/initrd.gz"
-	wget "$DI_WWW_HOME/vmlinuz-2.4.24-sparc32" -O "$inst/boot/sparc32"
-	wget "$DI_WWW_HOME/vmlinuz-2.4.24-sparc64"
-	zcat vmlinuz-2.4.24-sparc64 > "$inst/boot/sparc64"
+	DI_DIR="."
+	wget "$DI_WWW_HOME" -O di.dir
+	sparc32=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc32\)".*/\1/p' di.dir)
+	sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/p' di.dir)
+	wget "$DI_WWW_HOME/$sparc32" -O vmlinuz-x-sparc32
+	wget "$DI_WWW_HOME/$sparc64" -O vmlinuz-x-sparc64
+	wget "$DI_WWW_HOME/initrd.gz"
 fi
+cp "$DI_DIR"/initrd.gz "$inst/boot/initrd.gz"
+cp "$DI_DIR"/vmlinuz-*-sparc32 "$inst/boot/sparc32"
+zcat "$DI_DIR"/vmlinuz-*-sparc64 > "$inst/boot/sparc64"
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index f8b15dcb..130b10d6 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -115,6 +115,7 @@ cat >> debian-installer+kernel << EOF
 #endif
 #ifdef ARCH_powerpc
 discover1
+yaboot
 EOF
 
 # Only include powerpc kernels that d-i base-installer installs.