diff --git a/tasks/debian-installer b/tasks/debian-installer
index 76241c03..13733249 100644
--- a/tasks/debian-installer
+++ b/tasks/debian-installer
@@ -3,20 +3,22 @@
  * This list can be generated with the command:
  * ../tools/generate_di_list
  *
- * Last update: Sun Oct  5 08:09:05 MDT 2003
+ * Last update: Thu Nov 13 09:57:03 MST 2003
  */
 
 #ifdef ARCH_alpha
 anna
+archdetect
 autopartkit
 base-installer
 baseconfig-udeb
 bogl-bterm-udeb
+brltty-modules-2.4.22-1-generic-di
 brltty-modules-2.4.22-1-generic-udeb
 brltty-udeb
 bterm-unifont
+bugreporter-udeb
 busybox-cvs-udeb
-busybox-udeb
 cdebconf-gtk-udeb
 cdebconf-newt-udeb
 cdebconf-priority
@@ -24,8 +26,9 @@ cdebconf-slang-udeb
 cdebconf-text-udeb
 cdebconf-udeb
 cdrom-checker
+cdrom-core-modules-2.4.22-1-generic-di
 cdrom-detect
-cdrom-modules-2.4.20-generic-udeb
+cdrom-modules-2.4.22-1-generic-di
 cdrom-modules-2.4.22-1-generic-udeb
 cdrom-retriever
 choose-mirror
@@ -41,35 +44,37 @@ debootstrap-udeb
 dhcp-client-udeb
 dhcp3-client-udeb
 di-utils
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
-di-utils-mapdevfs
+di-utils-bootfloppy
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
 discover-udeb
+download-installer
 e2fsprogs-udeb
 ethdetect
 evms-udeb
-ext3-modules-2.4.20-generic-udeb
+ext3-modules-2.4.22-1-generic-di
 ext3-modules-2.4.22-1-generic-udeb
+fb-modules-2.4.22-1-generic-di
 fb-modules-2.4.22-1-generic-udeb
 fbset-udeb
 fdisk-udeb
-file-retriever
 floppy-retriever
 fontconfig-udeb
 hw-detect
 hw-detect-full
-ide-modules-2.4.20-generic-udeb
+ide-core-modules-2.4.22-1-generic-di
+ide-modules-2.4.22-1-generic-di
 ide-modules-2.4.22-1-generic-udeb
-ipv6-modules-2.4.20-generic-udeb
+ipv6-modules-2.4.22-1-generic-di
 ipv6-modules-2.4.22-1-generic-udeb
-isa-pnp-modules-2.4.20-generic-udeb
+isa-pnp-modules-2.4.22-1-generic-di
 isa-pnp-modules-2.4.22-1-generic-udeb
+iso-scan
 kbd-chooser
-kernel-image-2.4.20-generic-udeb
+kernel-image-2.4.22-1-generic-di
 kernel-image-2.4.22-1-generic-udeb
 kernel-installer
 languagechooser
@@ -82,9 +87,14 @@ libfreetype6-udeb
 libgtk+2.0-directfb0-udeb
 libparted1.6-udeb
 libpng12-0-udeb
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvm10-udeb
 lvmcfg
 main-menu
+md-modules-2.4.22-1-generic-di
 md-modules-2.4.22-1-generic-udeb
 mkreiserfs-udeb
 modutils-basic
@@ -92,14 +102,14 @@ modutils-full
 nano-udeb
 net-retriever
 netcfg-dhcp
-netcfg-ppp
 netcfg-static
+nic-extra-modules-2.4.22-1-generic-di
 nic-extra-modules-2.4.22-1-generic-udeb
-nic-modules-2.4.20-generic-udeb
+nic-modules-2.4.22-1-generic-di
 nic-modules-2.4.22-1-generic-udeb
-nic-modules-extra-2.4.20-generic-udeb
-nic-modules-shared-2.4.20-generic-udeb
+nic-shared-modules-2.4.22-1-generic-di
 nic-shared-modules-2.4.22-1-generic-udeb
+parport-modules-2.4.22-1-generic-di
 parport-modules-2.4.22-1-generic-udeb
 partconf
 partconf-find-partitions
@@ -107,31 +117,36 @@ partconf-mkfstab
 parted-udeb
 partitioner
 pcmcia-cs-udeb
-pcmcia-udeb
-plip-modules-2.4.20-generic-udeb
+plip-modules-2.4.22-1-generic-di
 plip-modules-2.4.22-1-generic-udeb
-ppp-modules-2.4.20-generic-udeb
+ppp-modules-2.4.22-1-generic-di
 ppp-modules-2.4.22-1-generic-udeb
 prebaseconfig
 pump-udeb
 raidtools2-udeb
+reiserfs-modules-2.4.22-1-generic-di
 reiserfs-modules-2.4.22-1-generic-udeb
 reiserfsprogs-udeb
 rootskel
 rootskel-bootfloppy
 rootskel-locale
-scsi-modules-2.4.20-generic-udeb
+scsi-core-modules-2.4.22-1-generic-di
+scsi-core-modules-2.4.22-1-generic-udeb
+scsi-extra-modules-2.4.22-1-generic-di
+scsi-modules-2.4.22-1-generic-di
 scsi-modules-2.4.22-1-generic-udeb
-serial-modules-2.4.20-generic-udeb
+serial-modules-2.4.22-1-generic-di
 serial-modules-2.4.22-1-generic-udeb
 slang1a-utf8-udeb
-socket-modules-2.4.20-generic-udeb
+socket-modules-2.4.22-1-generic-di
 socket-modules-2.4.22-1-generic-udeb
 srm-reader
 ttf-freefont-udeb
 udpkg
 usb-discover
+usb-modules-2.4.22-1-generic-di
 usb-modules-2.4.22-1-generic-udeb
+usb-storage-modules-2.4.22-1-generic-di
 usb-storage-modules-2.4.22-1-generic-udeb
 userdevfs
 zlib1g-udeb
@@ -139,14 +154,15 @@ zlib1g-udeb
 
 #ifdef ARCH_arm
 anna
+archdetect
 autopartkit
 base-installer
 baseconfig-udeb
 bogl-bterm-udeb
 brltty-udeb
 bterm-unifont
+bugreporter-udeb
 busybox-cvs-udeb
-busybox-udeb
 cdebconf-gtk-udeb
 cdebconf-newt-udeb
 cdebconf-priority
@@ -169,24 +185,24 @@ debootstrap-udeb
 dhcp-client-udeb
 dhcp3-client-udeb
 di-utils
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
-di-utils-mapdevfs
+di-utils-bootfloppy
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
 discover-udeb
+download-installer
 e2fsprogs-udeb
 ethdetect
 evms-udeb
 fbset-udeb
 fdisk-udeb
-file-retriever
 floppy-retriever
 fontconfig-udeb
 hw-detect
 hw-detect-full
+iso-scan
 kbd-chooser
 kernel-installer
 languagechooser
@@ -199,6 +215,10 @@ libfreetype6-udeb
 libgtk+2.0-directfb0-udeb
 libparted1.6-udeb
 libpng12-0-udeb
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvm10-udeb
 lvmcfg
 main-menu
@@ -208,14 +228,13 @@ modutils-full
 nano-udeb
 net-retriever
 netcfg-dhcp
-netcfg-ppp
 netcfg-static
 partconf
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
 partitioner
-pcmcia-udeb
+pcmcia-cs-udeb
 prebaseconfig
 pump-udeb
 raidtools2-udeb
@@ -233,14 +252,15 @@ zlib1g-udeb
 
 #ifdef ARCH_hppa
 anna
+archdetect
 autopartkit
 base-installer
 baseconfig-udeb
 bogl-bterm-udeb
 brltty-udeb
 bterm-unifont
+bugreporter-udeb
 busybox-cvs-udeb
-busybox-udeb
 cdebconf-gtk-udeb
 cdebconf-newt-udeb
 cdebconf-priority
@@ -263,24 +283,24 @@ debootstrap-udeb
 dhcp-client-udeb
 dhcp3-client-udeb
 di-utils
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
-di-utils-mapdevfs
+di-utils-bootfloppy
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
 discover-udeb
+download-installer
 e2fsprogs-udeb
 ethdetect
 evms-udeb
 fbset-udeb
 fdisk-udeb
-file-retriever
 floppy-retriever
 fontconfig-udeb
 hw-detect
 hw-detect-full
+iso-scan
 kbd-chooser
 kernel-image-2.4.20-32-udeb
 kernel-image-2.4.20-64-udeb
@@ -295,6 +315,10 @@ libexpat1-udeb
 libfreetype6-udeb
 libparted1.6-udeb
 libpng12-0-udeb
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvm10-udeb
 lvmcfg
 main-menu
@@ -304,7 +328,6 @@ modutils-full
 nano-udeb
 net-retriever
 netcfg-dhcp
-netcfg-ppp
 netcfg-static
 palo-installer
 partconf
@@ -312,12 +335,12 @@ partconf-find-partitions
 partconf-mkfstab
 parted-udeb
 partitioner
-pcmcia-udeb
 prebaseconfig
 pump-udeb
 raidtools2-udeb
 reiserfsprogs-udeb
 rootskel
+rootskel-bootfloppy
 rootskel-locale
 slang1a-utf8-udeb
 ttf-freefont-udeb
@@ -331,6 +354,7 @@ zlib1g-udeb
 anna
 baseconfig-udeb
 bterm-unifont
+bugreporter-udeb
 cdebconf-udeb
 cdrom-detect
 cdrom-retriever
@@ -343,26 +367,32 @@ console-keymaps-mac
 console-keymaps-sun
 console-keymaps-usb
 dash-udeb
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
+download-installer
 e2fsprogs-udeb
 ethdetect
 fdisk-udeb
-file-retriever
 floppy-retriever
+fontconfig-udeb
 hw-detect
 hw-detect-full
+iso-scan
 kernel-installer
 languagechooser
 libblkid1-udeb
 libc-udeb
+libexpat1-udeb
 libfreetype6-udeb
 libparted1.6-udeb
 libpng12-0-udeb
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvmcfg
 main-menu
 nano-udeb
@@ -370,7 +400,6 @@ net-retriever
 netcfg-dhcp
 netcfg-static
 parted-udeb
-pcmcia-udeb
 prebaseconfig
 rootskel
 slang1a-utf8-udeb
@@ -388,14 +417,12 @@ autopartkit
 base-installer
 baseconfig-udeb
 bogl-bterm-udeb
-brltty-modules-2.4.20-1-386-udeb
-brltty-modules-2.4.22-1-386-udeb
+brltty-modules-2.4.22-1-386-di
 brltty-udeb
 bterm-unifont
+bugreporter-udeb
 busybox-cvs-floppy-udeb
-busybox-cvs-net-udeb
 busybox-cvs-udeb
-busybox-udeb
 cdebconf-gtk-udeb
 cdebconf-newt-udeb
 cdebconf-priority
@@ -403,9 +430,9 @@ cdebconf-slang-udeb
 cdebconf-text-udeb
 cdebconf-udeb
 cdrom-checker
+cdrom-core-modules-2.4.22-1-386-di
 cdrom-detect
-cdrom-modules-2.4.20-1-386-udeb
-cdrom-modules-2.4.22-1-386-udeb
+cdrom-modules-2.4.22-1-386-di
 cdrom-retriever
 choose-mirror
 console-keymaps-acorn
@@ -420,44 +447,38 @@ debootstrap-udeb
 dhcp-client-udeb
 dhcp3-client-udeb
 di-utils
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
-di-utils-mapdevfs
+di-utils-bootfloppy
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
 discover-udeb
+download-installer
 e2fsprogs-udeb
 ethdetect
 evms-udeb
-ext3-modules-2.4.20-1-386-udeb
-ext3-modules-2.4.22-1-386-udeb
-fb-modules-2.4.20-1-386-udeb
-fb-modules-2.4.22-1-386-udeb
+ext3-modules-2.4.22-1-386-di
+fat-modules-2.4.22-1-386-di
+fb-modules-2.4.22-1-386-di
 fbset-udeb
 fdisk-udeb
-file-retriever
-floppy-modules-2.4.20-1-386-udeb
-floppy-modules-2.4.22-1-386-udeb
+firewire-core-modules-2.4.22-1-386-di
+floppy-modules-2.4.22-1-386-di
 floppy-retriever
 fontconfig-udeb
 grub-installer
 hw-detect
 hw-detect-full
-ide-modules-2.4.20-1-386-udeb
-ide-modules-2.4.22-1-386-udeb
-input-modules-2.4.20-1-386-udeb
-input-modules-2.4.22-1-386-udeb
-ipv6-modules-2.4.20-1-386-udeb
-ipv6-modules-2.4.22-1-386-udeb
-irda-modules-2.4.20-1-386-udeb
-irda-modules-2.4.22-1-386-udeb
-isa-pnp-modules-2.4.20-1-386-udeb
-isa-pnp-modules-2.4.22-1-386-udeb
+ide-core-modules-2.4.22-1-386-di
+ide-modules-2.4.22-1-386-di
+input-modules-2.4.22-1-386-di
+ipv6-modules-2.4.22-1-386-di
+irda-modules-2.4.22-1-386-di
+isa-pnp-modules-2.4.22-1-386-di
+iso-scan
 kbd-chooser
-kernel-image-2.4.20-1-386-udeb
-kernel-image-2.4.22-1-386-udeb
+kernel-image-2.4.22-1-386-di
 kernel-installer
 languagechooser
 libatk1.0-udeb
@@ -473,75 +494,70 @@ libpango1.0-udeb
 libparted1.6-udeb
 libpng12-0-udeb
 lilo-installer
+load-cdrom
+load-floppy
+load-installer
+load-iso
+loop-modules-2.4.22-1-386-di
 lvm10-udeb
 lvmcfg
 main-menu
-md-modules-2.4.20-1-386-udeb
-md-modules-2.4.22-1-386-udeb
+md-modules-2.4.22-1-386-di
 mkreiserfs-udeb
 modutils-basic
 modutils-full
 nano-udeb
 net-retriever
 netcfg-dhcp
-netcfg-ppp
 netcfg-static
-nic-extra-modules-2.4.20-1-386-udeb
-nic-extra-modules-2.4.22-1-386-udeb
-nic-modules-2.4.20-1-386-udeb
-nic-modules-2.4.22-1-386-udeb
-nic-pcmcia-modules-2.4.22-1-386-udeb
-nic-shared-modules-2.4.20-1-386-udeb
-nic-shared-modules-2.4.22-1-386-udeb
-parport-modules-2.4.20-1-386-udeb
-parport-modules-2.4.22-1-386-udeb
+nic-extra-modules-2.4.22-1-386-di
+nic-modules-2.4.22-1-386-di
+nic-pcmcia-modules-2.4.22-1-386-di
+nic-shared-modules-2.4.22-1-386-di
+parport-modules-2.4.22-1-386-di
 partconf
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
 partitioner
 pcmcia-cs-udeb
-pcmcia-modules-2.4.22-1-386-udeb
-pcmcia-udeb
-plip-modules-2.4.20-1-386-udeb
-plip-modules-2.4.22-1-386-udeb
-ppp-modules-2.4.20-1-386-udeb
-ppp-modules-2.4.22-1-386-udeb
+pcmcia-modules-2.4.22-1-386-di
+plip-modules-2.4.22-1-386-di
+ppp-modules-2.4.22-1-386-di
 prebaseconfig
 pump-udeb
 raidtools2-udeb
-reiserfs-modules-2.4.22-1-386-udeb
+reiserfs-modules-2.4.22-1-386-di
 reiserfsprogs-udeb
 rootskel
 rootskel-bootfloppy
 rootskel-locale
-scsi-modules-2.4.20-1-386-udeb
-scsi-modules-2.4.22-1-386-udeb
-serial-modules-2.4.20-1-386-udeb
-serial-modules-2.4.22-1-386-udeb
+scsi-core-modules-2.4.22-1-386-di
+scsi-extra-modules-2.4.22-1-386-di
+scsi-modules-2.4.22-1-386-di
+serial-modules-2.4.22-1-386-di
 slang1a-utf8-udeb
-socket-modules-2.4.20-1-386-udeb
-socket-modules-2.4.22-1-386-udeb
+socket-modules-2.4.22-1-386-di
 ttf-freefont-udeb
 udpkg
 usb-discover
-usb-modules-2.4.20-1-386-udeb
-usb-modules-2.4.22-1-386-udeb
-usb-storage-modules-2.4.22-1-386-udeb
+usb-modules-2.4.22-1-386-di
+usb-storage-modules-2.4.22-1-386-di
 userdevfs
 zlib1g-udeb
 #endif
 
 #ifdef ARCH_ia64
 anna
+archdetect
 autopartkit
 base-installer
 baseconfig-udeb
 bogl-bterm-udeb
 brltty-udeb
 bterm-unifont
+bugreporter-udeb
 busybox-cvs-udeb
-busybox-udeb
 cdebconf-gtk-udeb
 cdebconf-newt-udeb
 cdebconf-priority
@@ -564,14 +580,14 @@ debootstrap-udeb
 dhcp-client-udeb
 dhcp3-client-udeb
 di-utils
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
-di-utils-mapdevfs
+di-utils-bootfloppy
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
 discover-udeb
+download-installer
 e2fsprogs-udeb
 efi-reader
 elilo-installer
@@ -579,12 +595,12 @@ ethdetect
 evms-udeb
 fbset-udeb
 fdisk-udeb
-file-retriever
 floppy-retriever
 fontconfig-udeb
 hw-detect
 hw-detect-full
 ide-modules-2.4.20-ia64-udeb
+iso-scan
 kbd-chooser
 kernel-image-2.4.20-ia64-udeb
 kernel-installer
@@ -598,6 +614,10 @@ libfreetype6-udeb
 libgtk+2.0-directfb0-udeb
 libparted1.6-udeb
 libpng12-0-udeb
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvm10-udeb
 lvmcfg
 main-menu
@@ -607,7 +627,6 @@ modutils-full
 nano-udeb
 net-retriever
 netcfg-dhcp
-netcfg-ppp
 netcfg-static
 nic-modules-2.4.20-ia64-udeb
 partconf
@@ -616,7 +635,6 @@ partconf-mkfstab
 parted-udeb
 partitioner
 pcmcia-cs-udeb
-pcmcia-udeb
 ppp-modules-2.4.20-ia64-udeb
 prebaseconfig
 pump-udeb
@@ -636,14 +654,15 @@ zlib1g-udeb
 
 #ifdef ARCH_m68k
 anna
+archdetect
 autopartkit
 base-installer
 baseconfig-udeb
 bogl-bterm-udeb
 brltty-udeb
 bterm-unifont
+bugreporter-udeb
 busybox-cvs-udeb
-busybox-udeb
 cdebconf-gtk-udeb
 cdebconf-newt-udeb
 cdebconf-priority
@@ -666,30 +685,30 @@ debootstrap-udeb
 dhcp-client-udeb
 dhcp3-client-udeb
 di-utils
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
-di-utils-mapdevfs
+di-utils-bootfloppy
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
 discover-udeb
+download-installer
 e2fsprogs-udeb
 ethdetect
 evms-udeb
+fat-modules-2.4.20-amiga-di
 fbset-udeb
-file-retriever
 floppy-retriever
 fontconfig-udeb
 hw-detect
 hw-detect-full
-ide-modules-2.2.20-mac-udeb
 ide-modules-2.2.25-mac-udeb
-ipv6-modules-2.2.20-mac-udeb
 ipv6-modules-2.2.25-mac-udeb
+ipv6-modules-2.4.20-amiga-di
+iso-scan
 kbd-chooser
-kernel-image-2.2.20-mac-udeb
 kernel-image-2.2.25-mac-udeb
+kernel-image-2.4.20-amiga-di
 kernel-installer
 languagechooser
 libblkid1-udeb
@@ -701,6 +720,10 @@ libfreetype6-udeb
 libgtk+2.0-directfb0-udeb
 libparted1.6-udeb
 libpng12-0-udeb
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvm10-udeb
 lvmcfg
 mac-fdisk-udeb
@@ -711,26 +734,28 @@ modutils-full
 nano-udeb
 net-retriever
 netcfg-dhcp
-netcfg-ppp
 netcfg-static
+nic-shared-modules-2.4.20-amiga-di
+parport-modules-2.4.20-amiga-di
 partconf
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
 partitioner
-pcmcia-udeb
-ppp-modules-2.2.20-mac-udeb
 ppp-modules-2.2.25-mac-udeb
+ppp-modules-2.4.20-amiga-di
 prebaseconfig
 pump-udeb
 raidtools2-udeb
+reiserfs-modules-2.4.20-amiga-di
 reiserfsprogs-udeb
 rootskel
+rootskel-bootfloppy
 rootskel-locale
-scsi-modules-2.2.20-mac-udeb
+scsi-core-modules-2.4.20-amiga-di
 scsi-modules-2.2.25-mac-udeb
+serial-modules-2.4.20-amiga-di
 slang1a-utf8-udeb
-socket-modules-2.2.20-mac-udeb
 socket-modules-2.2.25-mac-udeb
 ttf-freefont-udeb
 udpkg
@@ -742,14 +767,15 @@ zlib1g-udeb
 #ifdef ARCH_mips
 anna
 arcboot-installer
+archdetect
 autopartkit
 base-installer
 baseconfig-udeb
 bogl-bterm-udeb
 brltty-udeb
 bterm-unifont
+bugreporter-udeb
 busybox-cvs-udeb
-busybox-udeb
 cdebconf-gtk-udeb
 cdebconf-newt-udeb
 cdebconf-priority
@@ -772,27 +798,27 @@ debootstrap-udeb
 dhcp-client-udeb
 dhcp3-client-udeb
 di-utils
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
-di-utils-mapdevfs
+di-utils-bootfloppy
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
 discover-udeb
+download-installer
 e2fsprogs-udeb
 ethdetect
 evms-udeb
 fbset-udeb
 fdisk-udeb
-file-retriever
 floppy-retriever
 fontconfig-udeb
 hw-detect
 hw-detect-full
+iso-scan
 kbd-chooser
 kernel-image-2.4.19-r4k-ip22-udeb
-kernel-image-2.4.21-r4k-ip22-udeb
+kernel-image-2.4.22-r4k-ip22-udeb
 kernel-installer
 languagechooser
 libblkid1-udeb
@@ -804,6 +830,10 @@ libfreetype6-udeb
 libgtk+2.0-directfb0-udeb
 libparted1.6-udeb
 libpng12-0-udeb
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvm10-udeb
 lvmcfg
 main-menu
@@ -813,16 +843,14 @@ modutils-full
 nano-udeb
 net-retriever
 netcfg-dhcp
-netcfg-ppp
 netcfg-static
 partconf
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
 partitioner
-pcmcia-udeb
 ppp-modules-2.4.19-r4k-ip22-udeb
-ppp-modules-2.4.21-r4k-ip22-udeb
+ppp-modules-2.4.22-r4k-ip22-udeb
 prebaseconfig
 pump-udeb
 raidtools2-udeb
@@ -839,14 +867,15 @@ zlib1g-udeb
 
 #ifdef ARCH_mipsel
 anna
+archdetect
 autopartkit
 base-installer
 baseconfig-udeb
 bogl-bterm-udeb
 brltty-udeb
 bterm-unifont
+bugreporter-udeb
 busybox-cvs-udeb
-busybox-udeb
 cdebconf-gtk-udeb
 cdebconf-newt-udeb
 cdebconf-priority
@@ -869,27 +898,29 @@ debootstrap-udeb
 dhcp-client-udeb
 dhcp3-client-udeb
 di-utils
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
-di-utils-mapdevfs
+di-utils-bootfloppy
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
 discover-udeb
+download-installer
 e2fsprogs-udeb
 ethdetect
 evms-udeb
 fbset-udeb
 fdisk-udeb
-file-retriever
 floppy-retriever
 fontconfig-udeb
 hw-detect
 hw-detect-full
+iso-scan
 kbd-chooser
 kernel-image-2.4.19-r3k-kn02-udeb
 kernel-image-2.4.19-r4k-kn04-udeb
+kernel-image-2.4.22-r3k-kn02-udeb
+kernel-image-2.4.22-r4k-kn04-udeb
 kernel-installer
 languagechooser
 libblkid1-udeb
@@ -901,6 +932,10 @@ libfreetype6-udeb
 libgtk+2.0-directfb0-udeb
 libparted1.6-udeb
 libpng12-0-udeb
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvm10-udeb
 lvmcfg
 main-menu
@@ -910,21 +945,22 @@ modutils-full
 nano-udeb
 net-retriever
 netcfg-dhcp
-netcfg-ppp
 netcfg-static
 partconf
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
 partitioner
-pcmcia-udeb
 ppp-modules-2.4.19-r3k-kn02-udeb
 ppp-modules-2.4.19-r4k-kn04-udeb
+ppp-modules-2.4.22-r3k-kn02-udeb
+ppp-modules-2.4.22-r4k-kn04-udeb
 prebaseconfig
 pump-udeb
 raidtools2-udeb
 reiserfsprogs-udeb
 rootskel
+rootskel-bootfloppy
 rootskel-locale
 slang1a-utf8-udeb
 ttf-freefont-udeb
@@ -936,14 +972,15 @@ zlib1g-udeb
 
 #ifdef ARCH_powerpc
 anna
+archdetect
 autopartkit
 base-installer
 baseconfig-udeb
 bogl-bterm-udeb
 brltty-udeb
 bterm-unifont
+bugreporter-udeb
 busybox-cvs-udeb
-busybox-udeb
 cdebconf-gtk-udeb
 cdebconf-newt-udeb
 cdebconf-priority
@@ -966,20 +1003,19 @@ debootstrap-udeb
 dhcp-client-udeb
 dhcp3-client-udeb
 di-utils
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
-di-utils-mapdevfs
+di-utils-bootfloppy
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
 discover-udeb
+download-installer
 e2fsprogs-udeb
 ethdetect
 evms-udeb
 fbset-udeb
 fdisk-udeb
-file-retriever
 floppy-retriever
 fontconfig-udeb
 hw-detect
@@ -988,6 +1024,7 @@ ide-modules-2.4.19-powerpc-udeb
 ide-modules-2.4.20-powerpc-udeb
 ide-modules-2.4.21-powerpc-udeb
 ide-modules-2.4.22-powerpc-udeb
+iso-scan
 kbd-chooser
 kernel-image-2.4.19-powerpc-udeb
 kernel-image-2.4.20-powerpc-udeb
@@ -1004,6 +1041,10 @@ libfreetype6-udeb
 libgtk+2.0-directfb0-udeb
 libparted1.6-udeb
 libpng12-0-udeb
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvm10-udeb
 lvmcfg
 mac-fdisk-udeb
@@ -1014,7 +1055,6 @@ modutils-full
 nano-udeb
 net-retriever
 netcfg-dhcp
-netcfg-ppp
 netcfg-static
 nic-modules-2.4.19-powerpc-udeb
 nic-modules-2.4.20-powerpc-udeb
@@ -1034,7 +1074,7 @@ partconf-find-partitions
 partconf-mkfstab
 parted-udeb
 partitioner
-pcmcia-udeb
+pcmcia-cs-udeb
 plip-modules-2.4.19-powerpc-udeb
 plip-modules-2.4.20-powerpc-udeb
 plip-modules-2.4.21-powerpc-udeb
@@ -1073,14 +1113,15 @@ zlib1g-udeb
 
 #ifdef ARCH_s390
 anna
+archdetect
 autopartkit
 base-installer
 baseconfig-udeb
 bogl-bterm-udeb
 brltty-udeb
 bterm-unifont
+bugreporter-udeb
 busybox-cvs-udeb
-busybox-udeb
 cdebconf-gtk-udeb
 cdebconf-newt-udeb
 cdebconf-priority
@@ -1103,25 +1144,25 @@ debootstrap-udeb
 dhcp-client-udeb
 dhcp3-client-udeb
 di-utils
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
-di-utils-mapdevfs
+di-utils-bootfloppy
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
 discover-udeb
+download-installer
 e2fsprogs-udeb
 ethdetect
 evms-udeb
 fbset-udeb
 fdisk-udeb
-file-retriever
 floppy-retriever
 fontconfig-udeb
 hw-detect
 hw-detect-full
 ipv6-modules-2.4.19-s390-udeb
+iso-scan
 kbd-chooser
 kernel-image-2.4.17-s390-tape-udeb
 kernel-image-2.4.19-s390-udeb
@@ -1136,6 +1177,10 @@ libfreetype6-udeb
 libgtk+2.0-directfb0-udeb
 libparted1.6-udeb
 libpng12-0-udeb
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvm10-udeb
 lvmcfg
 main-menu
@@ -1145,7 +1190,6 @@ modutils-full
 nano-udeb
 net-retriever
 netcfg-dhcp
-netcfg-ppp
 netcfg-static
 nic-modules-2.4.19-s390-udeb
 partconf
@@ -1153,7 +1197,6 @@ partconf-find-partitions
 partconf-mkfstab
 parted-udeb
 partitioner
-pcmcia-udeb
 prebaseconfig
 pump-udeb
 raidtools2-udeb
@@ -1174,14 +1217,15 @@ zlib1g-udeb
 
 #ifdef ARCH_sparc
 anna
+archdetect
 autopartkit
 base-installer
 baseconfig-udeb
 bogl-bterm-udeb
 brltty-udeb
 bterm-unifont
+bugreporter-udeb
 busybox-cvs-udeb
-busybox-udeb
 cdebconf-gtk-udeb
 cdebconf-newt-udeb
 cdebconf-priority
@@ -1204,25 +1248,25 @@ debootstrap-udeb
 dhcp-client-udeb
 dhcp3-client-udeb
 di-utils
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
-di-utils-mapdevfs
+di-utils-bootfloppy
+di-utils-exit-installer
+di-utils-reboot
 di-utils-shell
+di-utils-terminfo
 discover-data-udeb
 discover-udeb
+download-installer
 e2fsprogs-udeb
 ethdetect
 evms-udeb
 fbset-udeb
-file-retriever
 floppy-retriever
 fontconfig-udeb
 hw-detect
 hw-detect-full
 ide-modules-2.4.21-sparc64-udeb
 ieee1394-modules-2.4.21-sparc64-udeb
+iso-scan
 kbd-chooser
 kernel-image-2.4.21-sparc32-udeb
 kernel-image-2.4.21-sparc64-udeb
@@ -1237,6 +1281,10 @@ libfreetype6-udeb
 libgtk+2.0-directfb0-udeb
 libparted1.6-udeb
 libpng12-0-udeb
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvm10-udeb
 lvmcfg
 main-menu
@@ -1246,14 +1294,12 @@ modutils-full
 nano-udeb
 net-retriever
 netcfg-dhcp
-netcfg-ppp
 netcfg-static
 partconf
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
 partitioner
-pcmcia-udeb
 ppp-modules-2.4.21-sparc32-udeb
 ppp-modules-2.4.21-sparc64-udeb
 prebaseconfig
@@ -1275,6 +1321,7 @@ zlib1g-udeb
 #ifdef ARCH_sh
 baseconfig-udeb
 bterm-unifont
+bugreporter-udeb
 cdrom-detect
 cdrom-retriever
 console-keymaps-acorn
@@ -1284,21 +1331,24 @@ console-keymaps-atari
 console-keymaps-mac
 console-keymaps-sun
 console-keymaps-usb
-di-utils-fake-mkfs
-di-utils-fake-mkswap
-di-utils-fake-mount-partitions
-di-utils-fake-partitioner
+di-utils-exit-installer
+di-utils-reboot
+di-utils-terminfo
 discover-data-udeb
+download-installer
 ethdetect
-file-retriever
 floppy-retriever
 hw-detect
 hw-detect-full
+iso-scan
 kernel-installer
 languagechooser
+load-cdrom
+load-floppy
+load-installer
+load-iso
 lvmcfg
 net-retriever
-pcmcia-udeb
 prebaseconfig
 ttf-freefont-udeb
 usb-discover
diff --git a/tasks/debian-installer+kernel b/tasks/debian-installer+kernel
index b701f62e..e716f9c2 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 Oct  5 08:09:06 MDT 2003
+ * Last update: Thu Nov 13 09:57:03 MST 2003
  */
 
 #include <debian-installer>
@@ -19,14 +19,11 @@ aptitude
 kernel-image-2.4.22-1-386
 #endif
 #ifdef ARCH_alpha
-kernel-image-2.2.25-generic
-kernel-image-2.2.25-jensen
-kernel-image-2.2.25-nautilus
-kernel-image-2.2.25-smp
 kernel-image-2.4-generic
 kernel-image-2.4-smp
 kernel-image-2.4.22-1-generic
 kernel-image-2.4.22-1-smp
+kernel-image-2.6.0-test9-1-generic
 #endif
 #ifdef ARCH_ia64
 kernel-image-2.4.20-itanium
@@ -35,12 +32,7 @@ kernel-image-2.4.20-mckinley
 kernel-image-2.4.20-mckinley-smp
 #endif
 #ifdef ARCH_powerpc
-kernel-image-2.4.19-powerpc
-kernel-image-2.4.19-powerpc-smp
-kernel-image-2.4.20-apus
-kernel-image-2.4.20-powerpc
-kernel-image-2.4.20-powerpc-smp
-kernel-image-2.4.21-powerpc
-kernel-image-2.4.21-powerpc-smp
+kernel-image-2.4.22-powerpc
+kernel-image-2.4.22-powerpc-smp
 #endif
 
diff --git a/tools/boot/sarge/boot-alpha b/tools/boot/sarge/boot-alpha
index 4ea9d387..a34b436d 100755
--- a/tools/boot/sarge/boot-alpha
+++ b/tools/boot/sarge/boot-alpha
@@ -25,6 +25,9 @@ set -e
 N=$1
 CDDIR=$2
 BOOTDIR=
+if [ ! "$WWW_HOME" ];then
+   WWW_HOME="http://people.debian.org/~vorlon/d-i/images/daily"
+fi
 
 cd $CDDIR/..
 
@@ -46,7 +49,7 @@ NN=`echo $N | sed -e 's/_NONUS//'`
 for image in bootlx cdrom-initrd.gz cdrom-linux; do
     if [ ! -e "$image" ]; then
 	# XXX: not really 'daily'...
-	wget -q http://people.debian.org/~vorlon/d-i/images/daily/$image
+	wget $WWW_HOME/$image
     fi
 done
 
diff --git a/tools/boot/sarge/boot-i386 b/tools/boot/sarge/boot-i386
index 6c3cf020..89013b5a 100755
--- a/tools/boot/sarge/boot-i386
+++ b/tools/boot/sarge/boot-i386
@@ -13,6 +13,9 @@ set -e
 N=$1
 CDDIR=$2
 BOOTDIR=
+if [ ! "$WWW_HOME" ];then
+   WWW_HOME="http://people.debian.org/~sjogren/d-i/images/daily"
+fi
 
 cd $CDDIR/..
 
@@ -45,7 +48,7 @@ THISTYPE=${KTYPE[$NN]}
 # XXX add net-image.img back when it's fixed
 for image in cd_drivers-image.img cdrom-image.img cdrom-initrd.gz floppy-image.img floppy-initrd.gz net_drivers-image.img netboot-initrd.gz vmlinuz ; do
     if [ ! -e "$image" ]; then
-	wget -q http://people.debian.org/~sjogren/d-i/images/daily/$image
+	wget $WWW_HOME/$image
     fi
 done
 
diff --git a/tools/boot/sarge/boot-ia64 b/tools/boot/sarge/boot-ia64
index c3495af7..9cab5db3 100755
--- a/tools/boot/sarge/boot-ia64
+++ b/tools/boot/sarge/boot-ia64
@@ -13,6 +13,9 @@ set -x
 N=$1
 CDDIR=$2
 BOOTDIR=
+if [ ! "$WWW_HOME" ];then
+   WWW_HOME="http://people.debian.org/~jbailey/ia64"
+fi
 
 cd $CDDIR/..
 
@@ -25,7 +28,7 @@ fi
 # Download boot images
 for image in cdrom-image.img; do
     if [ ! -e "$image" ]; then
-	wget -q http://people.debian.org/~jbailey/ia64/$image
+	wget $WWW_HOME/$image
     fi
 done
 
diff --git a/tools/boot/sarge/boot-powerpc b/tools/boot/sarge/boot-powerpc
index 79248c96..07d1fa29 100755
--- a/tools/boot/sarge/boot-powerpc
+++ b/tools/boot/sarge/boot-powerpc
@@ -13,7 +13,9 @@ set -e
 N=$1
 CDDIR=$2
 INSTALLDIR=$CDDIR/install
-WWW_HOME="http://people.debian.org/~tsauter/"
+if [ ! "$WWW_HOME" ];then
+   WWW_HOME="http://people.debian.org/~tsauter/d-i/images-powerpc/daily"
+fi
 
 cd $CDDIR/..
 
@@ -59,8 +61,8 @@ cat $BASEDIR/data/sarge/yaboot/boot.msg \
 cat $BASEDIR/data/sarge/yaboot/yaboot.conf \
  | sed "s/CODENAME/${CODENAME}/g" > yaboot.conf
 cp $BASEDIR/data/yaboot/ofboot.b ofboot.b
-wget -O vmlinux $WWW_HOME/d-i/images-powerpc/daily/vmlinux
-wget -O root.bin $WWW_HOME/d-i/images-powerpc/daily/cdrom-initrd.gz
+wget -O vmlinux $WWW_HOME/vmlinux
+wget -O root.bin $WWW_HOME/cdrom-initrd.gz
 
 #
 # generate/download images for "apus"
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 2241c739..420a6d5f 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -54,8 +54,8 @@ cat >> debian-installer+kernel << EOF
 EOF
 
 #This is just temporary, they are going to change it all for 2.4.22
-/bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-powerpc/Packages \
+/bin/sed -n 's/Package: \(kernel-image-.*-powerpc.*\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-powerpc/Packages |tail -n 2 \
   >> debian-installer+kernel
 
 cat >> debian-installer+kernel << EOF