diff --git a/data/sarge/sparc/silo.conf b/data/sarge/sparc/silo.conf
index e0cd094a..6e0954a6 100644
--- a/data/sarge/sparc/silo.conf
+++ b/data/sarge/sparc/silo.conf
@@ -2,7 +2,7 @@ partition=1
 timeout=600
 message=/boot/debian.txt
 default=linux
-append="cdrom devfs=mount rw ramdisk_size=8192"
+append="cdrom devfs=mount rw"
 initrd=/boot/initrd.gz
 root=/dev/rd/0
 
diff --git a/debian/changelog b/debian/changelog
index fd46bfd4..f4916eb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -97,6 +97,8 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
     - 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.
+    - Remove ramdisk_size param of silo.conf.
+    - Add initrd-tools to sparc di+k list.
   * 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 fad3cd52..19cc1036 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: Sun Jun  6 23:08:14 MDT 2004
+ * Last update: Wed Aug  4 15:44:38 MDT 2004
  */
 #ifdef ARCH_alpha
 aboot-installer
@@ -11,14 +11,14 @@ archdetect
 autopartkit
 base-installer
 baseconfig-udeb
-brltty-modules-2.4.25-1-generic-di
+brltty-modules-2.4.26-1-generic-di
 brltty-udeb
 bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-cdrom-core-modules-2.4.25-1-generic-di
-cdrom-modules-2.4.25-1-generic-di
+cdrom-core-modules-2.4.26-1-generic-di
+cdrom-modules-2.4.26-1-generic-di
 choose-mirror
 console-keymaps-acorn
 console-keymaps-amiga
@@ -36,27 +36,28 @@ discover-data-udeb
 discover-udeb
 discover1-data-udeb
 discover1-udeb
-discover2-data-udeb
+dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
 evms-udeb
-ext3-modules-2.4.25-1-generic-di
-fat-modules-2.4.25-1-generic-di
-fb-modules-2.4.25-1-generic-di
+ext3-modules-2.4.26-1-generic-di
+fat-modules-2.4.26-1-generic-di
+fb-modules-2.4.26-1-generic-di
 fbset-udeb
 fdisk-udeb
 hw-detect-full
-ide-core-modules-2.4.25-1-generic-di
-ide-modules-2.4.25-1-generic-di
-ipv6-modules-2.4.25-1-generic-di
-isa-pnp-modules-2.4.25-1-generic-di
+ide-core-modules-2.4.26-1-generic-di
+ide-modules-2.4.26-1-generic-di
+ipv6-modules-2.4.26-1-generic-di
+isa-pnp-modules-2.4.26-1-generic-di
 iso-3166-udeb
-jfs-modules-2.4.25-1-generic-di
+jfs-modules-2.4.26-1-generic-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
 libc6.1-udeb
+libcrypto0.9.7-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
@@ -64,6 +65,7 @@ libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
 libnss-dns-udeb
+libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -72,19 +74,23 @@ lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.4.25-1-generic-di
+md-modules-2.4.26-1-generic-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
+mii-diag-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
-nic-extra-modules-2.4.25-1-generic-di
-nic-modules-2.4.25-1-generic-di
-nic-shared-modules-2.4.25-1-generic-di
+network-console
+nic-extra-modules-2.4.26-1-generic-di
+nic-modules-2.4.26-1-generic-di
+nic-shared-modules-2.4.26-1-generic-di
 nobootloader
+openssh-client-udeb
+openssh-server-udeb
 os-prober
-parport-modules-2.4.25-1-generic-di
+parport-modules-2.4.26-1-generic-di
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
@@ -101,26 +107,27 @@ partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
-plip-modules-2.4.25-1-generic-di
-ppp-modules-2.4.25-1-generic-di
+plip-modules-2.4.26-1-generic-di
+ppp-modules-2.4.26-1-generic-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
 reiserfs-modules-2.4.25-1-generic-di
-scsi-common-modules-2.4.25-1-generic-di
-scsi-core-modules-2.4.25-1-generic-di
-scsi-extra-modules-2.4.25-1-generic-di
-scsi-modules-2.4.25-1-generic-di
-serial-modules-2.4.25-1-generic-di
-socket-modules-2.4.25-1-generic-di
-srm-modules-2.4.25-1-generic-di
+scsi-common-modules-2.4.26-1-generic-di
+scsi-core-modules-2.4.26-1-generic-di
+scsi-extra-modules-2.4.26-1-generic-di
+scsi-modules-2.4.26-1-generic-di
+serial-modules-2.4.26-1-generic-di
+socket-modules-2.4.26-1-generic-di
+srm-modules-2.4.26-1-generic-di
 srm-reader
-usb-modules-2.4.25-1-generic-di
-usb-storage-modules-2.4.25-1-generic-di
+usb-modules-2.4.26-1-generic-di
+usb-storage-modules-2.4.26-1-generic-di
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.4.25-1-generic-di
+xfs-modules-2.4.26-1-generic-di
 xfsprogs-udeb
+zlib1g-udeb
 #endif /* ARCH_alpha */
 #ifdef ARCH_arm
 archdetect
@@ -151,7 +158,7 @@ discover-data-udeb
 discover-udeb
 discover1-data-udeb
 discover1-udeb
-discover2-data-udeb
+dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
@@ -168,6 +175,7 @@ jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
 libc6-udeb
+libcrypto0.9.7-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
@@ -175,6 +183,7 @@ libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
 libnss-dns-udeb
+libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -189,13 +198,17 @@ lvmcfg-utils
 mdadm-udeb
 mdcfg
 mdcfg-utils
+mii-diag-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
+network-console
 nic-extra-modules-2.4.25-netwinder-di
 nic-modules-2.4.25-netwinder-di
 nic-shared-modules-2.4.25-netwinder-di
 nobootloader
+openssh-client-udeb
+openssh-server-udeb
 os-prober
 partconf-find-partitions
 partconf-mkfstab
@@ -230,6 +243,7 @@ usb-modules-2.4.25-netwinder-di
 userdevfs
 wireless-tools-udeb
 xfsprogs-udeb
+zlib1g-udeb
 #endif /* ARCH_arm */
 #ifdef ARCH_hppa
 archdetect
@@ -258,7 +272,7 @@ discover-data-udeb
 discover-udeb
 discover1-data-udeb
 discover1-udeb
-discover2-data-udeb
+dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
@@ -273,6 +287,7 @@ jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
 libc6-udeb
+libcrypto0.9.7-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
@@ -280,6 +295,7 @@ libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
 libnss-dns-udeb
+libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -291,12 +307,16 @@ lvmcfg-utils
 mdadm-udeb
 mdcfg
 mdcfg-utils
+mii-diag-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
+network-console
 nic-modules-2.4.25-32-di
 nic-modules-2.4.25-64-di
 nobootloader
+openssh-client-udeb
+openssh-server-udeb
 os-prober
 palo-installer
 partconf-find-partitions
@@ -324,9 +344,60 @@ raidtools2-udeb
 userdevfs
 wireless-tools-udeb
 xfsprogs-udeb
+zlib1g-udeb
 #endif /* ARCH_hppa */
-#ifdef ARCH_hurd-i386
-#endif /* ARCH_hurd-i386 */
+#ifdef ARCH_hurd_i386
+baseconfig-udeb
+bugreporter-udeb
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+di-utils
+discover-data-udeb
+discover1-data-udeb
+e2fsprogs-udeb
+ethdetect
+fdisk-udeb
+hw-detect-full
+iso-3166-udeb
+libblkid1-udeb
+libc0.3-udeb
+libcrypto0.9.7-udeb
+libfribidi0-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+lowmem
+lvmcfg
+lvmcfg-utils
+mdcfg
+mdcfg-utils
+net-retriever
+nobootloader
+parted-udeb
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-partitioning
+partman-reiserfs
+partman-target
+partman-xfs
+prebaseconfig
+userdevfs
+zlib1g-udeb
+#endif /* ARCH_hurd_i386 */
 #ifdef ARCH_i386
 archdetect
 autopartkit
@@ -349,26 +420,34 @@ debootstrap-udeb
 dhcp-client-udeb
 di-utils
 di-utils-mapdevfs
+dmidecode-udeb
+dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
 evms-udeb
 ext3-modules-2.4.26-1-386-di
-ext3-modules-2.6.5-1-386-di
+ext3-modules-2.6.7-1-386-di
 fbset-udeb
 fdisk-udeb
+firewire-core-modules-2.4.26-1-386-di
+firewire-core-modules-2.6.7-1-386-di
+firmware-modules-2.6.7-1-386-di
+floppy-modules-2.4.26-1-386-di
+floppy-modules-2.6.7-1-386-di
 grub-installer
 hw-detect-full
 ipv6-modules-2.4.26-1-386-di
-ipv6-modules-2.6.5-1-386-di
+ipv6-modules-2.6.7-1-386-di
 irda-modules-2.4.26-1-386-di
-irda-modules-2.6.5-1-386-di
+irda-modules-2.6.7-1-386-di
 iso-3166-udeb
 jfs-modules-2.4.26-1-386-di
-jfs-modules-2.6.5-1-386-di
+jfs-modules-2.6.7-1-386-di
 jfsutils-udeb
 libblkid1-udeb
 libc6-udeb
+libcrypto0.9.7-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
@@ -376,41 +455,46 @@ libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
 libnss-dns-udeb
+libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
 lilo-installer
 loop-modules-2.4.26-1-386-di
-loop-modules-2.6.5-1-386-di
+loop-modules-2.6.7-1-386-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
 md-modules-2.4.26-1-386-di
-md-modules-2.6.5-1-386-di
+md-modules-2.6.7-1-386-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
+mii-diag-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
+network-console
 nic-extra-modules-2.4.26-1-386-di
-nic-extra-modules-2.6.5-1-386-di
+nic-extra-modules-2.6.7-1-386-di
 nic-modules-2.4.26-1-386-di
-nic-modules-2.6.5-1-386-di
+nic-modules-2.6.7-1-386-di
 nic-pcmcia-modules-2.4.26-1-386-di
-nic-pcmcia-modules-2.6.5-1-386-di
+nic-pcmcia-modules-2.6.7-1-386-di
 nic-shared-modules-2.4.26-1-386-di
-nic-shared-modules-2.6.5-1-386-di
+nic-shared-modules-2.6.7-1-386-di
 nic-usb-modules-2.4.26-1-386-di
-nic-usb-modules-2.6.5-1-386-di
+nic-usb-modules-2.6.7-1-386-di
 nobootloader
 ntfs-modules-2.4.26-1-386-di
-ntfs-modules-2.6.5-1-386-di
+ntfs-modules-2.6.7-1-386-di
+openssh-client-udeb
+openssh-server-udeb
 os-prober
 parport-modules-2.4.26-1-386-di
-parport-modules-2.6.5-1-386-di
+parport-modules-2.6.7-1-386-di
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
@@ -428,46 +512,49 @@ partman-target
 partman-xfs
 pcmcia-cs-udeb
 pcmcia-modules-2.4.26-1-386-di
-pcmcia-modules-2.6.5-1-386-di
+pcmcia-modules-2.6.7-1-386-di
 pcmcia-storage-modules-2.4.26-1-386-di
-pcmcia-storage-modules-2.6.5-1-386-di
+pcmcia-storage-modules-2.6.7-1-386-di
 plip-modules-2.4.26-1-386-di
-plip-modules-2.6.5-1-386-di
+plip-modules-2.6.7-1-386-di
 ppp-modules-2.4.26-1-386-di
-ppp-modules-2.6.5-1-386-di
+ppp-modules-2.6.7-1-386-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
 reiserfs-modules-2.4.26-1-386-di
-reiserfs-modules-2.6.5-1-386-di
+reiserfs-modules-2.6.7-1-386-di
 sata-modules-2.4.26-1-386-di
-sata-modules-2.6.5-1-386-di
+sata-modules-2.6.7-1-386-di
 scsi-common-modules-2.4.26-1-386-di
-scsi-common-modules-2.6.5-1-386-di
+scsi-common-modules-2.6.7-1-386-di
 scsi-extra-modules-2.4.26-1-386-di
-scsi-extra-modules-2.6.5-1-386-di
+scsi-extra-modules-2.6.7-1-386-di
 scsi-modules-2.4.26-1-386-di
-scsi-modules-2.6.5-1-386-di
+scsi-modules-2.6.7-1-386-di
 serial-modules-2.4.26-1-386-di
-serial-modules-2.6.5-1-386-di
+serial-modules-2.6.7-1-386-di
 ufs-modules-2.4.26-1-386-di
+ufs-modules-2.6.7-1-386-di
 wireless-tools-udeb
 xfs-modules-2.4.26-1-386-di
-xfs-modules-2.6.5-1-386-di
+xfs-modules-2.6.7-1-386-di
 xfsprogs-udeb
+zlib1g-udeb
 #endif /* ARCH_i386 */
 #ifdef ARCH_ia64
 archdetect
 autopartkit
 base-installer
 baseconfig-udeb
-brltty-modules-2.4.25-itanium-smp-di
+brltty-modules-2.4.26-itanium-smp-di
 brltty-udeb
 bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-cdrom-core-modules-2.4.25-itanium-smp-di
+cdrom-core-modules-2.4.26-itanium-smp-di
+cdrom-core-modules-2.6.7-1-itanium-smp-di
 choose-mirror
 console-keymaps-acorn
 console-keymaps-amiga
@@ -485,29 +572,42 @@ discover-data-udeb
 discover-udeb
 discover1-data-udeb
 discover1-udeb
-discover2-data-udeb
+dmidecode-udeb
+dmsetup-udeb
 e2fsprogs-udeb
 efi-reader
 eject-udeb
 elilo-installer
 ethdetect
 evms-udeb
-ext3-modules-2.4.25-itanium-smp-di
-fat-modules-2.4.25-itanium-smp-di
-fb-modules-2.4.25-itanium-smp-di
+ext3-modules-2.4.26-itanium-smp-di
+ext3-modules-2.6.7-1-itanium-smp-di
+fat-modules-2.4.26-itanium-smp-di
+fat-modules-2.6.7-1-itanium-smp-di
+fb-modules-2.4.26-itanium-smp-di
+fb-modules-2.6.7-1-itanium-smp-di
 fbset-udeb
 fdisk-udeb
-firewire-core-modules-2.4.25-itanium-smp-di
+firewire-core-modules-2.4.26-itanium-smp-di
+firewire-core-modules-2.6.7-1-itanium-smp-di
+firmware-modules-2.6.7-1-itanium-smp-di
 hw-detect-full
-ide-core-modules-2.4.25-itanium-smp-di
-ide-modules-2.4.25-itanium-smp-di
-input-modules-2.4.25-itanium-smp-di
-ipv6-modules-2.4.25-itanium-smp-di
+ide-core-modules-2.4.26-itanium-smp-di
+ide-core-modules-2.6.7-1-itanium-smp-di
+ide-modules-2.4.26-itanium-smp-di
+ide-modules-2.6.7-1-itanium-smp-di
+input-modules-2.4.26-itanium-smp-di
+input-modules-2.6.7-1-itanium-smp-di
+ipv6-modules-2.4.26-itanium-smp-di
+ipv6-modules-2.6.7-1-itanium-smp-di
+irda-modules-2.6.7-1-itanium-smp-di
 iso-3166-udeb
+jfs-modules-2.6.7-1-itanium-smp-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
 libc6.1-udeb
+libcrypto0.9.7-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
@@ -515,26 +615,38 @@ libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
 libnss-dns-udeb
+libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
-loop-modules-2.4.25-itanium-smp-di
+loop-modules-2.4.26-itanium-smp-di
+loop-modules-2.6.7-1-itanium-smp-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.4.25-itanium-smp-di
+md-modules-2.4.26-itanium-smp-di
+md-modules-2.6.7-1-itanium-smp-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
+mii-diag-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
-nic-modules-2.4.25-itanium-smp-di
+network-console
+nic-modules-2.4.26-itanium-smp-di
+nic-modules-2.6.7-1-itanium-smp-di
+nic-shared-modules-2.6.7-1-itanium-smp-di
+nic-usb-modules-2.6.7-1-itanium-smp-di
 nobootloader
+ntfs-modules-2.6.7-1-itanium-smp-di
+openssh-client-udeb
+openssh-server-udeb
 os-prober
-parport-modules-2.4.25-itanium-smp-di
+parport-modules-2.4.26-itanium-smp-di
+parport-modules-2.6.7-1-itanium-smp-di
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
@@ -551,20 +663,33 @@ partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
-plip-modules-2.4.25-itanium-smp-di
-ppp-modules-2.4.25-itanium-smp-di
+pcmcia-modules-2.6.7-1-itanium-smp-di
+plip-modules-2.4.26-itanium-smp-di
+plip-modules-2.6.7-1-itanium-smp-di
+ppp-modules-2.4.26-itanium-smp-di
+ppp-modules-2.6.7-1-itanium-smp-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-reiserfs-modules-2.4.25-itanium-smp-di
-scsi-modules-2.4.25-itanium-smp-di
-serial-modules-2.4.25-itanium-smp-di
-usb-modules-2.4.25-itanium-smp-di
-usb-storage-modules-2.4.25-itanium-smp-di
+reiserfs-modules-2.4.26-itanium-smp-di
+reiserfs-modules-2.6.7-1-itanium-smp-di
+sata-modules-2.6.7-1-itanium-smp-di
+scsi-core-modules-2.6.7-1-itanium-smp-di
+scsi-modules-2.4.26-itanium-smp-di
+scsi-modules-2.6.7-1-itanium-smp-di
+serial-modules-2.4.26-itanium-smp-di
+serial-modules-2.6.7-1-itanium-smp-di
+ufs-modules-2.6.7-1-itanium-smp-di
+usb-modules-2.4.26-itanium-smp-di
+usb-modules-2.6.7-1-itanium-smp-di
+usb-storage-modules-2.4.26-itanium-smp-di
+usb-storage-modules-2.6.7-1-itanium-smp-di
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.4.25-itanium-smp-di
+xfs-modules-2.4.26-itanium-smp-di
+xfs-modules-2.6.7-1-itanium-smp-di
 xfsprogs-udeb
+zlib1g-udeb
 #endif /* ARCH_ia64 */
 #ifdef ARCH_m68k
 archdetect
@@ -594,7 +719,7 @@ discover-data-udeb
 discover-udeb
 discover1-data-udeb
 discover1-udeb
-discover2-data-udeb
+dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
@@ -610,13 +735,10 @@ 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
+fat-modules-2.4.26-q40-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
@@ -625,10 +747,12 @@ 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
+jfs-modules-2.4.26-q40-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
 libc6-udeb
+libcrypto0.9.7-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
@@ -636,6 +760,7 @@ libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
 libnss-dns-udeb
+libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -648,9 +773,11 @@ mac-fdisk-udeb
 mdadm-udeb
 mdcfg
 mdcfg-utils
+mii-diag-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
+network-console
 nic-shared-modules-2.2.25-atari-di
 nic-shared-modules-2.2.25-bvme6000-di
 nic-shared-modules-2.2.25-mac-di
@@ -662,7 +789,10 @@ 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
+nic-shared-modules-2.4.26-q40-di
 nobootloader
+openssh-client-udeb
+openssh-server-udeb
 os-prober
 partconf
 partconf-find-partitions
@@ -693,6 +823,7 @@ 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-modules-2.4.26-q40-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
@@ -702,6 +833,7 @@ 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
+reiserfs-modules-2.4.26-q40-di
 scsi-modules-2.2.25-atari-di
 scsi-modules-2.2.25-bvme6000-di
 scsi-modules-2.2.25-mac-di
@@ -713,9 +845,12 @@ 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
+scsi-modules-2.4.26-q40-di
 userdevfs
+vmelilo-installer
 wireless-tools-udeb
 xfsprogs-udeb
+zlib1g-udeb
 #endif /* ARCH_m68k */
 #ifdef ARCH_mips
 arcboot-installer
@@ -728,7 +863,7 @@ bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-cdrom-core-modules-2.4.25-sb1-swarm-bn-di
+cdrom-core-modules-2.4.26-sb1-swarm-bn-di
 choose-mirror
 console-keymaps-acorn
 console-keymaps-amiga
@@ -746,26 +881,27 @@ discover-data-udeb
 discover-udeb
 discover1-data-udeb
 discover1-udeb
-discover2-data-udeb
+dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
 evms-udeb
-fat-modules-2.4.25-sb1-swarm-bn-di
+fat-modules-2.4.26-sb1-swarm-bn-di
 fbset-udeb
 fdisk-udeb
 hw-detect-full
-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
+ipv6-modules-2.4.26-r4k-ip22-di
+ipv6-modules-2.4.26-r5k-ip22-di
+ipv6-modules-2.4.26-sb1-swarm-bn-di
 iso-3166-udeb
-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
+jfs-modules-2.4.26-r4k-ip22-di
+jfs-modules-2.4.26-r5k-ip22-di
+jfs-modules-2.4.26-sb1-swarm-bn-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
 libc6-udeb
+libcrypto0.9.7-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
@@ -773,25 +909,30 @@ libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
 libnss-dns-udeb
+libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
-loop-modules-2.4.25-sb1-swarm-bn-di
+loop-modules-2.4.26-sb1-swarm-bn-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-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
+md-modules-2.4.26-r4k-ip22-di
+md-modules-2.4.26-r5k-ip22-di
+md-modules-2.4.26-sb1-swarm-bn-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
+mii-diag-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
+network-console
 nobootloader
+openssh-client-udeb
+openssh-server-udeb
 os-prober
 partconf
 partconf-find-partitions
@@ -811,20 +952,24 @@ partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
-ppp-modules-2.4.19-r4k-ip22-udeb
-ppp-modules-2.4.25-sb1-swarm-bn-di
+pcmcia-storage-modules-2.4.26-sb1-swarm-bn-di
+ppp-modules-2.4.26-sb1-swarm-bn-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-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
+reiserfs-modules-2.4.26-r4k-ip22-di
+reiserfs-modules-2.4.26-r5k-ip22-di
+reiserfs-modules-2.4.26-sb1-swarm-bn-di
+sata-modules-2.4.26-sb1-swarm-bn-di
+scsi-common-modules-2.4.26-sb1-swarm-bn-di
+scsi-core-modules-2.4.26-sb1-swarm-bn-di
+scsi-modules-2.4.26-sb1-swarm-bn-di
+usb-storage-modules-2.4.26-sb1-swarm-bn-di
 userdevfs
 wireless-tools-udeb
+xfs-modules-2.4.26-sb1-swarm-bn-di
 xfsprogs-udeb
+zlib1g-udeb
 #endif /* ARCH_mips */
 #ifdef ARCH_mipsel
 archdetect
@@ -836,10 +981,12 @@ 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
+cdrom-core-modules-2.4.26-r5k-cobalt-di
+cdrom-core-modules-2.4.26-sb1-swarm-bn-di
 choose-mirror
+cobalt-scripts
 colo-installer
+colo-udeb
 console-keymaps-acorn
 console-keymaps-amiga
 console-keymaps-at
@@ -857,27 +1004,28 @@ discover-data-udeb
 discover-udeb
 discover1-data-udeb
 discover1-udeb
-discover2-data-udeb
+dmsetup-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
+fat-modules-2.4.26-r5k-cobalt-di
+fat-modules-2.4.26-sb1-swarm-bn-di
 fbset-udeb
 fdisk-udeb
 hw-detect-full
-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
+ipv6-modules-2.4.26-r3k-kn02-di
+ipv6-modules-2.4.26-r4k-kn04-di
+ipv6-modules-2.4.26-r5k-cobalt-di
+ipv6-modules-2.4.26-sb1-swarm-bn-di
 iso-3166-udeb
-jfs-modules-2.4.25-r5k-cobalt-di
-jfs-modules-2.4.25-sb1-swarm-bn-di
+jfs-modules-2.4.26-r5k-cobalt-di
+jfs-modules-2.4.26-sb1-swarm-bn-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
 libc6-udeb
+libcrypto0.9.7-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
@@ -885,27 +1033,32 @@ libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
 libnss-dns-udeb
+libnss-files-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
+loop-modules-2.4.26-r5k-cobalt-di
+loop-modules-2.4.26-sb1-swarm-bn-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-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
+md-modules-2.4.26-r3k-kn02-di
+md-modules-2.4.26-r4k-kn04-di
+md-modules-2.4.26-r5k-cobalt-di
+md-modules-2.4.26-sb1-swarm-bn-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
+mii-diag-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
+network-console
 nobootloader
+openssh-client-udeb
+openssh-server-udeb
 os-prober
 partconf-find-partitions
 partconf-mkfstab
@@ -924,36 +1077,36 @@ partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
-ppp-modules-2.4.19-r3k-kn02-udeb
-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
+pcmcia-storage-modules-2.4.26-sb1-swarm-bn-di
+ppp-modules-2.4.26-r5k-cobalt-di
+ppp-modules-2.4.26-sb1-swarm-bn-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-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
+reiserfs-modules-2.4.26-r3k-kn02-di
+reiserfs-modules-2.4.26-r4k-kn04-di
+reiserfs-modules-2.4.26-r5k-cobalt-di
+reiserfs-modules-2.4.26-sb1-swarm-bn-di
+sata-modules-2.4.26-sb1-swarm-bn-di
+scsi-common-modules-2.4.26-sb1-swarm-bn-di
+scsi-core-modules-2.4.26-sb1-swarm-bn-di
+scsi-modules-2.4.26-sb1-swarm-bn-di
+usb-storage-modules-2.4.26-sb1-swarm-bn-di
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.4.25-r5k-cobalt-di
+xfs-modules-2.4.26-r5k-cobalt-di
+xfs-modules-2.4.26-sb1-swarm-bn-di
 xfsprogs-udeb
+zlib1g-udeb
 #endif /* ARCH_mipsel */
 #ifdef ARCH_powerpc
 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
+affs-modules-2.6.7-power3-di
+affs-modules-2.6.7-power4-di
+affs-modules-2.6.7-powerpc-di
 archdetect
 autopartkit
 base-installer
@@ -967,111 +1120,74 @@ bterm-unifont
 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
-console-keymaps-at
 console-keymaps-atari
 console-keymaps-dec
 console-keymaps-mac
 console-keymaps-sun
-console-keymaps-usb
 debootstrap-udeb
 dhcp-client-udeb
 di-utils
 di-utils-mapdevfs
-discover-data-udeb
-discover-udeb
-discover1-data-udeb
-discover1-udeb
-discover2-data-udeb
+dmsetup-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
+ext2-modules-2.6.7-power3-di
+ext2-modules-2.6.7-power4-di
+ext2-modules-2.6.7-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
+ext3-modules-2.6.7-power3-di
+ext3-modules-2.6.7-power4-di
+ext3-modules-2.6.7-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
+fat-modules-2.6.7-power3-di
+fat-modules-2.6.7-power4-di
+fat-modules-2.6.7-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
+fb-modules-2.6.7-power3-di
+fb-modules-2.6.7-power4-di
+fb-modules-2.6.7-powerpc-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
+firmware-modules-2.6.7-power3-di
+firmware-modules-2.6.7-power4-di
+firmware-modules-2.6.7-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
+floppy-modules-2.6.7-power3-di
+floppy-modules-2.6.7-power4-di
+floppy-modules-2.6.7-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
+hfs-modules-2.6.7-power3-di
+hfs-modules-2.6.7-power4-di
+hfs-modules-2.6.7-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
+ipv6-modules-2.6.7-power3-di
+ipv6-modules-2.6.7-power4-di
+ipv6-modules-2.6.7-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
+irda-modules-2.6.7-power3-di
+irda-modules-2.6.7-power4-di
+irda-modules-2.6.7-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
@@ -1079,14 +1195,13 @@ 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
+jfs-modules-2.6.7-power3-di
+jfs-modules-2.6.7-power4-di
+jfs-modules-2.6.7-powerpc-di
 jfsutils-udeb
-kbd-chooser
 libblkid1-udeb
 libc6-udeb
+libcrypto0.9.7-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
@@ -1094,6 +1209,7 @@ libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
 libnss-dns-udeb
+libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -1101,10 +1217,9 @@ 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
+loop-modules-2.6.7-power3-di
+loop-modules-2.6.7-power4-di
+loop-modules-2.6.7-powerpc-di
 lowmem
 lvm10-udeb
 lvm2-udeb
@@ -1116,53 +1231,49 @@ 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
+md-modules-2.6.7-power3-di
+md-modules-2.6.7-power4-di
+md-modules-2.6.7-powerpc-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
+mii-diag-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
+network-console
 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-extra-modules-2.6.7-power3-di
+nic-extra-modules-2.6.7-power4-di
+nic-extra-modules-2.6.7-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-modules-2.6.7-power3-di
+nic-modules-2.6.7-power4-di
+nic-modules-2.6.7-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-pcmcia-modules-2.6.7-power3-di
+nic-pcmcia-modules-2.6.7-power4-di
+nic-pcmcia-modules-2.6.7-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
+nic-shared-modules-2.6.7-power3-di
+nic-shared-modules-2.6.7-power4-di
+nic-shared-modules-2.6.7-powerpc-di
 nobootloader
+openssh-client-udeb
+openssh-server-udeb
 os-prober
 parport-modules-2.4.25-apus-di
 parport-modules-2.4.25-powerpc-small-di
@@ -1182,29 +1293,6 @@ 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
@@ -1215,96 +1303,44 @@ 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-modules-2.6.7-power3-di
+ppp-modules-2.6.7-power4-di
+ppp-modules-2.6.7-powerpc-di
 ppp-udeb
 prebaseconfig
+quik-installer
 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
+reiserfs-modules-2.6.7-power3-di
+reiserfs-modules-2.6.7-power4-di
+reiserfs-modules-2.6.7-powerpc-di
+sata-modules-2.6.7-power3-di
+sata-modules-2.6.7-power4-di
+sata-modules-2.6.7-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
+scsi-extra-modules-2.6.7-power3-di
+scsi-extra-modules-2.6.7-power4-di
+scsi-extra-modules-2.6.7-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
+serial-modules-2.6.7-power3-di
+serial-modules-2.6.7-power4-di
+serial-modules-2.6.7-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
+ufs-modules-2.6.7-power3-di
+ufs-modules-2.6.7-power4-di
+ufs-modules-2.6.7-powerpc-di
 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
+xfs-modules-2.6.7-power3-di
+xfs-modules-2.6.7-power4-di
+xfs-modules-2.6.7-powerpc-di
 xfsprogs-udeb
 yaboot-installer
+zlib1g-udeb
 #endif /* ARCH_powerpc */
 #ifdef ARCH_s390
 archdetect
@@ -1333,7 +1369,7 @@ discover-data-udeb
 discover-udeb
 discover1-data-udeb
 discover1-udeb
-discover2-data-udeb
+dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
@@ -1343,9 +1379,9 @@ fdisk-udeb
 hw-detect-full
 iso-3166-udeb
 jfsutils-udeb
-kbd-chooser
 libblkid1-udeb
 libc6-udeb
+libcrypto0.9.7-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
@@ -1353,6 +1389,7 @@ libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
 libnss-dns-udeb
+libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -1364,11 +1401,15 @@ lvmcfg-utils
 mdadm-udeb
 mdcfg
 mdcfg-utils
+mii-diag-udeb
 mkreiserfs-udeb
 net-retriever
+network-console
 nic-modules-2.4.21-1-s390-di
-nic-modules-2.4.25-1-s390-di
+nic-modules-2.4.26-1-s390-di
 nobootloader
+openssh-client-udeb
+openssh-server-udeb
 os-prober
 partconf
 partconf-find-partitions
@@ -1394,12 +1435,14 @@ s390-dasd
 s390-netdevice
 s390-tools-udeb
 scsi-core-modules-2.4.21-1-s390-di
-scsi-core-modules-2.4.25-1-s390-di
+scsi-core-modules-2.4.26-1-s390-di
 scsi-modules-2.4.21-1-s390-di
-scsi-modules-2.4.25-1-s390-di
+scsi-modules-2.4.26-1-s390-di
 userdevfs
 wireless-tools-udeb
 xfsprogs-udeb
+zipl-installer
+zlib1g-udeb
 #endif /* ARCH_s390 */
 #ifdef ARCH_sparc
 archdetect
@@ -1411,7 +1454,6 @@ bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-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
@@ -1431,15 +1473,14 @@ discover-data-udeb
 discover-udeb
 discover1-data-udeb
 discover1-udeb
-discover2-data-udeb
+dmsetup-udeb
 e2fsprogs-udeb
 eject-udeb
 ethdetect
 evms-udeb
 fbset-udeb
+fdisk-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
@@ -1447,6 +1488,7 @@ jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
 libc6-udeb
+libcrypto0.9.7-udeb
 libdebian-installer-extra4-udeb
 libdebian-installer4-udeb
 libdevmapper1.00-udeb
@@ -1454,6 +1496,7 @@ libdirectfb-0.9-20-udeb
 libfribidi0-udeb
 libiw27-udeb
 libnss-dns-udeb
+libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
@@ -1465,16 +1508,17 @@ lvmcfg-utils
 mdadm-udeb
 mdcfg
 mdcfg-utils
+mii-diag-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
-nic-pci-modules-2.4.24-sparc64-di
+network-console
 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
+openssh-client-udeb
+openssh-server-udeb
 os-prober
 partconf-find-partitions
 partconf-mkfstab
@@ -1492,8 +1536,6 @@ partman-reiserfs
 partman-target
 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
@@ -1503,6 +1545,43 @@ silo-installer
 userdevfs
 wireless-tools-udeb
 xfsprogs-udeb
+zlib1g-udeb
 #endif /* ARCH_sparc */
 #ifdef ARCH_sh
+baseconfig-udeb
+bugreporter-udeb
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+di-utils
+discover-data-udeb
+discover1-data-udeb
+ethdetect
+hw-detect-full
+iso-3166-udeb
+lowmem
+lvmcfg
+lvmcfg-utils
+mdcfg
+mdcfg-utils
+net-retriever
+nobootloader
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+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 a09b4b02..a9baa6b2 100644
--- a/tasks/debian-installer+kernel
+++ b/tasks/debian-installer+kernel
@@ -5,7 +5,7 @@
  * This list can be generated with the command:
  * ../tools/generate_di+k_list
  *
- * Last update: Sun Jun  6 23:08:15 MDT 2004
+ * Last update: Wed Aug  4 15:44:40 MDT 2004
  */
 
 #include <debian-installer>
@@ -20,6 +20,7 @@ aptitude
 jfbterm
 unifont
 hotplug
+usbutils
 iso-codes
 console-cyrillic
 console-terminus
@@ -28,6 +29,7 @@ wireless-tools
 xfsprogs
 jfsutils
 reiserfsprogs
+libfribidi0
 #ifdef ARCH_i386
 discover
 discover1
@@ -35,7 +37,7 @@ grub
 lilo
 kernel-image-2.4.26-1-386
 kernel-pcmcia-modules-2.4.26-1-386
-kernel-image-2.6.6-1-386
+kernel-image-2.6.7-1-386
 #endif
 #ifdef ARCH_alpha
 aboot
@@ -43,14 +45,10 @@ aboot-base
 discover1
 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.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
@@ -65,10 +63,14 @@ kernel-image-netbootable
 #ifdef ARCH_ia64
 discover1
 initrd-tools
-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
+kernel-image-2.4.26-1-itanium
+kernel-image-2.4.26-1-itanium-smp
+kernel-image-2.4.26-1-mckinley
+kernel-image-2.4.26-1-mckinley-smp
+kernel-image-2.4-itanium
+kernel-image-2.4-itanium-smp
+kernel-image-2.4-mckinley
+kernel-image-2.4-mckinley-smp
 #endif
 #ifdef ARCH_mips
 arcboot
@@ -82,7 +84,18 @@ kernel-image-2.4.26-r4k-kn04
 #endif
 #ifdef ARCH_powerpc
 discover1
+quik
 yaboot
+mkvmlinuz
+module-init-tools
+initrd-tools
+kernel-image-2.6.7-powerpc
+kernel-image-2.6.7-power3
+kernel-image-2.6.7-power4
+kernel-image-2.4.25-power3-pmac
+kernel-image-2.4.25-power3-chrp-rs6k
+kernel-image-2.4.25-power4-pmac
+kernel-image-2.4.25-power4-chrp-rs6k
 kernel-image-2.4.25-powerpc-pmac
 kernel-image-2.4.25-powerpc-small-pmac
 kernel-image-2.4.25-powerpc-prep
@@ -93,6 +106,10 @@ kernel-image-2.4.25-apus
 #ifdef ARCH_sparc
 discover1
 initrd-tools
+kernel-image-2.4-sparc32
+kernel-image-2.4-sparc32-smp
+kernel-image-2.4-sparc64
+kernel-image-2.4-sparc64-smp
 kernel-image-2.4.26-sparc32
 kernel-image-2.4.26-sparc32-smp
 kernel-image-2.4.26-sparc64
@@ -100,9 +117,9 @@ kernel-image-2.4.26-sparc64-smp
 #endif
 #ifdef ARCH_m68k
 kernel-image-2.2.25-mac
-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
+kernel-image-2.4.26-q40
 #endif
diff --git a/tools/boot/sarge/boot-alpha b/tools/boot/sarge/boot-alpha
index 4111a88d..397f4771 100755
--- a/tools/boot/sarge/boot-alpha
+++ b/tools/boot/sarge/boot-alpha
@@ -26,7 +26,7 @@ N=$1
 CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
-   DI_WWW_HOME="http://people.debian.org/~vorlon/d-i/images/daily/cdrom/"
+   DI_WWW_HOME="http://people.debian.org/~jbailey/d-i/alpha/daily/cdrom/"
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index f459d626..c0c077e9 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -144,6 +144,7 @@ cat >> debian-installer+kernel << EOF
 #endif
 #ifdef ARCH_sparc
 discover1
+initrd-tools
 EOF
 
 /bin/sed -n 's/Package: \(kernel-image-.*-sparc.*\)$/\1/p' \