diff --git a/build.sh b/build.sh
index d7601952..63bd6d55 100755
--- a/build.sh
+++ b/build.sh
@@ -60,6 +60,6 @@ echo " ... building the images"
 if [ -z "$IMAGETARGET" ] ; then
     IMAGETARGET="official_images"
 fi
-make "$IMAGETARGET"
+make $IMAGETARGET
 
 make imagesums
diff --git a/debian/changelog b/debian/changelog
index 8ef7cc96..c18126e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,8 @@ debian-cd (2.2.20) UNRELEASED; urgency=low
     - Try to fix powerpc DVD builds via -hfs-parms MAX_XTCSIZE.
     - Add prep powerpc support.
     - Update debian-installer tasks.
+    - Add tools/calc script to update .calc files with up to date
+      estimations on the iso size parameters.
   * Thiemo Seufer
     - Add arcboot to the mips tasks/base-sarge list, like it is done for
       other bootloaders.
diff --git a/tasks/debian-installer b/tasks/debian-installer
index 2a89c69f..cf6f8062 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: Mon Sep 27 15:44:56 MDT 2004
+ * Last update: Wed Oct  6 05:35:55 MDT 2004
  */
 #ifdef ARCH_alpha
 aboot-installer
@@ -11,14 +11,14 @@ archdetect
 autopartkit
 base-installer
 baseconfig-udeb
-brltty-modules-2.4.26-1-generic-di
+brltty-modules-2.4.27-1-generic-di
 brltty-udeb
 bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-cdrom-core-modules-2.4.26-1-generic-di
-cdrom-modules-2.4.26-1-generic-di
+cdrom-core-modules-2.4.27-1-generic-di
+cdrom-modules-2.4.27-1-generic-di
 choose-mirror
 console-keymaps-acorn
 console-keymaps-amiga
@@ -41,17 +41,18 @@ e2fsprogs-udeb
 eject-udeb
 ethdetect
 evms-udeb
-ext3-modules-2.4.26-1-generic-di
-fat-modules-2.4.26-1-generic-di
-fb-modules-2.4.26-1-generic-di
+ext3-modules-2.4.27-1-generic-di
+fat-modules-2.4.27-1-generic-di
+fb-modules-2.4.27-1-generic-di
 fbset-udeb
 fdisk-udeb
+hdparm-udeb
 hw-detect-full
-ide-core-modules-2.4.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
-jfs-modules-2.4.26-1-generic-di
+ide-core-modules-2.4.27-1-generic-di
+ide-modules-2.4.27-1-generic-di
+ipv6-modules-2.4.27-1-generic-di
+isa-pnp-modules-2.4.27-1-generic-di
+jfs-modules-2.4.27-1-generic-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
@@ -72,23 +73,26 @@ lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.4.26-1-generic-di
+md-modules-2.4.27-1-generic-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
 mii-diag-udeb
+mkreiser4-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
 network-console
-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
+network-preseed
+nic-extra-modules-2.4.27-1-generic-di
+nic-modules-2.4.27-1-generic-di
+nic-shared-modules-2.4.27-1-generic-di
 nobootloader
+ntfstools-udeb
 openssh-client-udeb
 openssh-server-udeb
 os-prober
-parport-modules-2.4.26-1-generic-di
+parport-modules-2.4.27-1-generic-di
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
@@ -105,25 +109,25 @@ partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
-plip-modules-2.4.26-1-generic-di
-ppp-modules-2.4.26-1-generic-di
+plip-modules-2.4.27-1-generic-di
+ppp-modules-2.4.27-1-generic-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-reiserfs-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
+reiser4progs-udeb
+scsi-common-modules-2.4.27-1-generic-di
+scsi-core-modules-2.4.27-1-generic-di
+scsi-extra-modules-2.4.27-1-generic-di
+scsi-modules-2.4.27-1-generic-di
+serial-modules-2.4.27-1-generic-di
+socket-modules-2.4.27-1-generic-di
+srm-modules-2.4.27-1-generic-di
 srm-reader
-usb-modules-2.4.26-1-generic-di
-usb-storage-modules-2.4.26-1-generic-di
+usb-modules-2.4.27-1-generic-di
+usb-storage-modules-2.4.27-1-generic-di
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.4.26-1-generic-di
+xfs-modules-2.4.27-1-generic-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_alpha */
@@ -137,8 +141,8 @@ bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-cdrom-core-modules-2.4.25-bast-di
-cdrom-core-modules-2.4.25-netwinder-di
+cdrom-core-modules-2.4.27-bast-di
+cdrom-core-modules-2.4.27-netwinder-di
 choose-mirror
 console-keymaps-acorn
 console-keymaps-amiga
@@ -161,13 +165,14 @@ e2fsprogs-udeb
 eject-udeb
 ethdetect
 evms-udeb
-fat-modules-2.4.25-netwinder-di
-fat-modules-2.4.25-riscpc-di
-fat-modules-2.4.25-riscstation-di
+fat-modules-2.4.27-netwinder-di
+fat-modules-2.4.27-riscpc-di
+fat-modules-2.4.27-riscstation-di
 fbset-udeb
 fdisk-udeb
+hdparm-udeb
 hw-detect-full
-isa-pnp-modules-2.4.25-netwinder-di
+isa-pnp-modules-2.4.27-netwinder-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
@@ -183,26 +188,30 @@ libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
-loop-modules-2.4.25-bast-di
-loop-modules-2.4.25-netwinder-di
-loop-modules-2.4.25-riscpc-di
+loop-modules-2.4.27-bast-di
+loop-modules-2.4.27-netwinder-di
+loop-modules-2.4.27-riscpc-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
+md-modules-2.4.27-netwinder-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
 mii-diag-udeb
+mkreiser4-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
 network-console
-nic-extra-modules-2.4.25-netwinder-di
-nic-modules-2.4.25-netwinder-di
-nic-shared-modules-2.4.25-netwinder-di
+network-preseed
+nic-extra-modules-2.4.27-netwinder-di
+nic-modules-2.4.27-netwinder-di
+nic-shared-modules-2.4.27-netwinder-di
 nobootloader
+ntfstools-udeb
 openssh-client-udeb
 openssh-server-udeb
 os-prober
@@ -226,16 +235,17 @@ pcmcia-cs-udeb
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-scsi-common-modules-2.4.25-netwinder-di
-scsi-core-modules-2.4.25-netwinder-di
-scsi-extra-modules-2.4.25-netwinder-di
-scsi-modules-2.4.25-netwinder-di
-socket-modules-2.4.25-bast-di
-socket-modules-2.4.25-lart-di
-socket-modules-2.4.25-netwinder-di
-socket-modules-2.4.25-riscpc-di
-socket-modules-2.4.25-riscstation-di
-usb-modules-2.4.25-netwinder-di
+reiser4progs-udeb
+scsi-common-modules-2.4.27-netwinder-di
+scsi-core-modules-2.4.27-netwinder-di
+scsi-extra-modules-2.4.27-netwinder-di
+scsi-modules-2.4.27-netwinder-di
+socket-modules-2.4.27-bast-di
+socket-modules-2.4.27-lart-di
+socket-modules-2.4.27-netwinder-di
+socket-modules-2.4.27-riscpc-di
+socket-modules-2.4.27-riscstation-di
+usb-modules-2.4.27-netwinder-di
 userdevfs
 wireless-tools-udeb
 xfsprogs-udeb
@@ -275,9 +285,10 @@ ethdetect
 evms-udeb
 fbset-udeb
 fdisk-udeb
+hdparm-udeb
 hw-detect-full
-ipv6-modules-2.4.25-32-di
-ipv6-modules-2.4.25-64-di
+ipv6-modules-2.4.27-32-di
+ipv6-modules-2.4.27-64-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
@@ -302,13 +313,16 @@ mdadm-udeb
 mdcfg
 mdcfg-utils
 mii-diag-udeb
+mkreiser4-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
 network-console
-nic-modules-2.4.25-32-di
-nic-modules-2.4.25-64-di
+network-preseed
+nic-modules-2.4.27-32-di
+nic-modules-2.4.27-64-di
 nobootloader
+ntfstools-udeb
 openssh-client-udeb
 openssh-server-udeb
 os-prober
@@ -330,22 +344,76 @@ partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
-ppp-modules-2.4.25-32-di
-ppp-modules-2.4.25-64-di
+ppp-modules-2.4.27-32-di
+ppp-modules-2.4.27-64-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
+reiser4progs-udeb
 userdevfs
 wireless-tools-udeb
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_hppa */
+#ifdef ARCH_hurd_i386
+baseconfig-udeb
+bugreporter-udeb
+choose-mirror
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-at
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-mac
+console-keymaps-sun
+console-keymaps-usb
+di-utils
+discover-data-udeb
+discover1-data-udeb
+e2fsprogs-udeb
+ethdetect
+fdisk-udeb
+hw-detect-full
+libblkid1-udeb
+libc0.3-udeb
+libcrypto0.9.7-udeb
+libnss-dns-udeb
+libnss-files-udeb
+libparted1.6-udeb
+libreiserfs0.3-udeb
+libuuid1-udeb
+lowmem
+lvmcfg
+lvmcfg-utils
+mdcfg
+mdcfg-utils
+net-retriever
+network-console
+network-preseed
+nobootloader
+os-prober
+parted-udeb
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-reiserfs
+partman-target
+partman-xfs
+prebaseconfig
+userdevfs
+zlib1g-udeb
+#endif /* ARCH_hurd_i386 */
 #ifdef ARCH_i386
+acpi-modules-2.6.8-1-386-di
 archdetect
 autopartkit
 base-installer
 baseconfig-udeb
-brltty-modules-2.4.26-1-386-di
+brltty-modules-2.4.27-1-386-di
 brltty-udeb
 bterm-unifont
 bugreporter-udeb
@@ -368,23 +436,25 @@ e2fsprogs-udeb
 eject-udeb
 ethdetect
 evms-udeb
-ext3-modules-2.4.26-1-386-di
-ext3-modules-2.6.7-1-386-di
-fat-modules-2.4.26-1-386-di
-fat-modules-2.6.7-1-386-di
+ext3-modules-2.4.27-1-386-di
+ext3-modules-2.6.8-1-386-di
+fat-modules-2.4.27-1-386-di
+fat-modules-2.6.8-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
+firewire-core-modules-2.4.27-1-386-di
+firewire-core-modules-2.6.8-1-386-di
+firmware-modules-2.4.27-1-386-di
+firmware-modules-2.6.8-1-386-di
 grub-installer
+hdparm-udeb
 hw-detect-full
-ipv6-modules-2.4.26-1-386-di
-ipv6-modules-2.6.7-1-386-di
-irda-modules-2.4.26-1-386-di
-irda-modules-2.6.7-1-386-di
-jfs-modules-2.4.26-1-386-di
-jfs-modules-2.6.7-1-386-di
+ipv6-modules-2.4.27-1-386-di
+ipv6-modules-2.6.8-1-386-di
+irda-modules-2.4.27-1-386-di
+irda-modules-2.6.8-1-386-di
+jfs-modules-2.4.27-1-386-di
+jfs-modules-2.6.8-1-386-di
 jfsutils-udeb
 libblkid1-udeb
 libc6-udeb
@@ -400,41 +470,44 @@ libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
 lilo-installer
-loop-modules-2.4.26-1-386-di
-loop-modules-2.6.7-1-386-di
+loop-modules-2.4.27-1-386-di
+loop-modules-2.6.8-1-386-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.4.26-1-386-di
-md-modules-2.6.7-1-386-di
+md-modules-2.4.27-1-386-di
+md-modules-2.6.8-1-386-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
 mii-diag-udeb
+mkreiser4-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
 network-console
-nic-extra-modules-2.4.26-1-386-di
-nic-extra-modules-2.6.7-1-386-di
-nic-modules-2.4.26-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.7-1-386-di
-nic-shared-modules-2.4.26-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.7-1-386-di
+network-preseed
+nic-extra-modules-2.4.27-1-386-di
+nic-extra-modules-2.6.8-1-386-di
+nic-modules-2.4.27-1-386-di
+nic-modules-2.6.8-1-386-di
+nic-pcmcia-modules-2.4.27-1-386-di
+nic-pcmcia-modules-2.6.8-1-386-di
+nic-shared-modules-2.4.27-1-386-di
+nic-shared-modules-2.6.8-1-386-di
+nic-usb-modules-2.4.27-1-386-di
+nic-usb-modules-2.6.8-1-386-di
 nobootloader
-ntfs-modules-2.4.26-1-386-di
-ntfs-modules-2.6.7-1-386-di
+ntfs-modules-2.4.27-1-386-di
+ntfs-modules-2.6.8-1-386-di
+ntfstools-udeb
 openssh-client-udeb
 openssh-server-udeb
 os-prober
-parport-modules-2.4.26-1-386-di
-parport-modules-2.6.7-1-386-di
+parport-modules-2.4.27-1-386-di
+parport-modules-2.6.8-1-386-di
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
@@ -451,34 +524,35 @@ partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
-pcmcia-modules-2.4.26-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.7-1-386-di
-plip-modules-2.4.26-1-386-di
-plip-modules-2.6.7-1-386-di
-ppp-modules-2.4.26-1-386-di
-ppp-modules-2.6.7-1-386-di
+pcmcia-modules-2.4.27-1-386-di
+pcmcia-modules-2.6.8-1-386-di
+pcmcia-storage-modules-2.4.27-1-386-di
+pcmcia-storage-modules-2.6.8-1-386-di
+plip-modules-2.4.27-1-386-di
+plip-modules-2.6.8-1-386-di
+ppp-modules-2.4.27-1-386-di
+ppp-modules-2.6.8-1-386-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-reiserfs-modules-2.4.26-1-386-di
-reiserfs-modules-2.6.7-1-386-di
-sata-modules-2.4.26-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.7-1-386-di
-scsi-extra-modules-2.4.26-1-386-di
-scsi-extra-modules-2.6.7-1-386-di
-scsi-modules-2.4.26-1-386-di
-scsi-modules-2.6.7-1-386-di
-serial-modules-2.4.26-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
+reiser4progs-udeb
+reiserfs-modules-2.4.27-1-386-di
+reiserfs-modules-2.6.8-1-386-di
+sata-modules-2.4.27-1-386-di
+sata-modules-2.6.8-1-386-di
+scsi-common-modules-2.4.27-1-386-di
+scsi-common-modules-2.6.8-1-386-di
+scsi-extra-modules-2.4.27-1-386-di
+scsi-extra-modules-2.6.8-1-386-di
+scsi-modules-2.4.27-1-386-di
+scsi-modules-2.6.8-1-386-di
+serial-modules-2.4.27-1-386-di
+serial-modules-2.6.8-1-386-di
+ufs-modules-2.4.27-1-386-di
+ufs-modules-2.6.8-1-386-di
 wireless-tools-udeb
-xfs-modules-2.4.26-1-386-di
-xfs-modules-2.6.7-1-386-di
+xfs-modules-2.4.27-1-386-di
+xfs-modules-2.6.8-1-386-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_i386 */
@@ -487,14 +561,14 @@ archdetect
 autopartkit
 base-installer
 baseconfig-udeb
-brltty-modules-2.4.26-itanium-smp-di
+brltty-modules-2.4.27-1-itanium-smp-di
 brltty-udeb
 bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-cdrom-core-modules-2.4.26-itanium-smp-di
-cdrom-core-modules-2.6.7-1-itanium-smp-di
+cdrom-core-modules-2.4.27-1-itanium-smp-di
+cdrom-core-modules-2.6.8-1-itanium-smp-di
 choose-mirror
 console-keymaps-acorn
 console-keymaps-amiga
@@ -520,28 +594,30 @@ eject-udeb
 elilo-installer
 ethdetect
 evms-udeb
-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
+ext3-modules-2.4.27-1-itanium-smp-di
+ext3-modules-2.6.8-1-itanium-smp-di
+fat-modules-2.4.27-1-itanium-smp-di
+fat-modules-2.6.8-1-itanium-smp-di
+fb-modules-2.4.27-1-itanium-smp-di
+fb-modules-2.6.8-1-itanium-smp-di
 fbset-udeb
 fdisk-udeb
-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
+firewire-core-modules-2.4.27-1-itanium-smp-di
+firewire-core-modules-2.6.8-1-itanium-smp-di
+firmware-modules-2.4.27-1-itanium-smp-di
+firmware-modules-2.6.8-1-itanium-smp-di
+hdparm-udeb
 hw-detect-full
-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
-jfs-modules-2.6.7-1-itanium-smp-di
+ide-core-modules-2.4.27-1-itanium-smp-di
+ide-core-modules-2.6.8-1-itanium-smp-di
+ide-modules-2.4.27-1-itanium-smp-di
+ide-modules-2.6.8-1-itanium-smp-di
+input-modules-2.4.27-1-itanium-smp-di
+input-modules-2.6.8-1-itanium-smp-di
+ipv6-modules-2.4.27-1-itanium-smp-di
+ipv6-modules-2.6.8-1-itanium-smp-di
+irda-modules-2.6.8-1-itanium-smp-di
+jfs-modules-2.6.8-1-itanium-smp-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
@@ -557,34 +633,37 @@ libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
-loop-modules-2.4.26-itanium-smp-di
-loop-modules-2.6.7-1-itanium-smp-di
+loop-modules-2.4.27-1-itanium-smp-di
+loop-modules-2.6.8-1-itanium-smp-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.4.26-itanium-smp-di
-md-modules-2.6.7-1-itanium-smp-di
+md-modules-2.4.27-1-itanium-smp-di
+md-modules-2.6.8-1-itanium-smp-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
 mii-diag-udeb
+mkreiser4-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
 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
+network-preseed
+nic-modules-2.4.27-1-itanium-smp-di
+nic-modules-2.6.8-1-itanium-smp-di
+nic-shared-modules-2.6.8-1-itanium-smp-di
+nic-usb-modules-2.6.8-1-itanium-smp-di
 nobootloader
-ntfs-modules-2.6.7-1-itanium-smp-di
+ntfs-modules-2.6.8-1-itanium-smp-di
+ntfstools-udeb
 openssh-client-udeb
 openssh-server-udeb
 os-prober
-parport-modules-2.4.26-itanium-smp-di
-parport-modules-2.6.7-1-itanium-smp-di
+parport-modules-2.4.27-1-itanium-smp-di
+parport-modules-2.6.8-1-itanium-smp-di
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
@@ -592,6 +671,7 @@ partman
 partman-auto
 partman-basicfilesystems
 partman-basicmethods
+partman-efi
 partman-ext3
 partman-jfs
 partman-lvm
@@ -601,31 +681,32 @@ partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
-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
+pcmcia-modules-2.6.8-1-itanium-smp-di
+plip-modules-2.4.27-1-itanium-smp-di
+plip-modules-2.6.8-1-itanium-smp-di
+ppp-modules-2.4.27-1-itanium-smp-di
+ppp-modules-2.6.8-1-itanium-smp-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-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
+reiser4progs-udeb
+reiserfs-modules-2.4.27-1-itanium-smp-di
+reiserfs-modules-2.6.8-1-itanium-smp-di
+sata-modules-2.6.8-1-itanium-smp-di
+scsi-core-modules-2.6.8-1-itanium-smp-di
+scsi-modules-2.4.27-1-itanium-smp-di
+scsi-modules-2.6.8-1-itanium-smp-di
+serial-modules-2.4.27-1-itanium-smp-di
+serial-modules-2.6.8-1-itanium-smp-di
+ufs-modules-2.6.8-1-itanium-smp-di
+usb-modules-2.4.27-1-itanium-smp-di
+usb-modules-2.6.8-1-itanium-smp-di
+usb-storage-modules-2.4.27-1-itanium-smp-di
+usb-storage-modules-2.6.8-1-itanium-smp-di
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.4.26-itanium-smp-di
-xfs-modules-2.6.7-1-itanium-smp-di
+xfs-modules-2.4.27-1-itanium-smp-di
+xfs-modules-2.6.8-1-itanium-smp-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_ia64 */
@@ -667,24 +748,21 @@ 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
-fat-modules-2.4.26-q40-di
+fat-modules-2.4.27-amiga-di
+fat-modules-2.4.27-atari-di
+fat-modules-2.4.27-bvme6000-di
+fat-modules-2.4.27-mvme147-di
+fat-modules-2.4.27-mvme16x-di
+fat-modules-2.4.27-q40-di
 fbset-udeb
+hdparm-udeb
 hw-detect-full
-ipv6-modules-2.2.25-mac-di
-ipv6-modules-2.4.25-amiga-di
-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
-jfs-modules-2.4.26-q40-di
+jfs-modules-2.4.27-amiga-di
+jfs-modules-2.4.27-atari-di
+jfs-modules-2.4.27-bvme6000-di
+jfs-modules-2.4.27-mvme147-di
+jfs-modules-2.4.27-mvme16x-di
+jfs-modules-2.4.27-q40-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
@@ -710,23 +788,25 @@ mdadm-udeb
 mdcfg
 mdcfg-utils
 mii-diag-udeb
+mkreiser4-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
 network-console
+network-preseed
 nic-shared-modules-2.2.25-atari-di
 nic-shared-modules-2.2.25-bvme6000-di
 nic-shared-modules-2.2.25-mac-di
 nic-shared-modules-2.2.25-mvme147-di
 nic-shared-modules-2.2.25-mvme16x-di
-nic-shared-modules-2.4.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
-nic-shared-modules-2.4.26-q40-di
+nic-shared-modules-2.4.27-amiga-di
+nic-shared-modules-2.4.27-atari-di
+nic-shared-modules-2.4.27-bvme6000-di
+nic-shared-modules-2.4.27-mvme147-di
+nic-shared-modules-2.4.27-mvme16x-di
+nic-shared-modules-2.4.27-q40-di
 nobootloader
+ntfstools-udeb
 openssh-client-udeb
 openssh-server-udeb
 os-prober
@@ -753,35 +833,33 @@ 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-modules-2.4.26-q40-di
+ppp-modules-2.4.27-amiga-di
+ppp-modules-2.4.27-atari-di
+ppp-modules-2.4.27-bvme6000-di
+ppp-modules-2.4.27-mvme147-di
+ppp-modules-2.4.27-mvme16x-di
+ppp-modules-2.4.27-q40-di
 ppp-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
-reiserfs-modules-2.4.26-q40-di
+reiser4progs-udeb
+reiserfs-modules-2.4.27-amiga-di
+reiserfs-modules-2.4.27-atari-di
+reiserfs-modules-2.4.27-bvme6000-di
+reiserfs-modules-2.4.27-mvme147-di
+reiserfs-modules-2.4.27-mvme16x-di
+reiserfs-modules-2.4.27-q40-di
 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
-scsi-modules-2.4.26-q40-di
+scsi-modules-2.4.27-amiga-di
+scsi-modules-2.4.27-atari-di
+scsi-modules-2.4.27-bvme6000-di
+scsi-modules-2.4.27-mvme147-di
+scsi-modules-2.4.27-mvme16x-di
+scsi-modules-2.4.27-q40-di
 userdevfs
 vmelilo-installer
 wireless-tools-udeb
@@ -799,7 +877,7 @@ bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-cdrom-core-modules-2.4.26-sb1-swarm-bn-di
+cdrom-core-modules-2.4.27-sb1-swarm-bn-di
 choose-mirror
 console-keymaps-acorn
 console-keymaps-amiga
@@ -822,16 +900,19 @@ e2fsprogs-udeb
 eject-udeb
 ethdetect
 evms-udeb
-fat-modules-2.4.26-sb1-swarm-bn-di
+fat-modules-2.4.27-sb1-swarm-bn-di
+fb-modules-2.4.27-sb1-swarm-bn-di
 fbset-udeb
 fdisk-udeb
+hdparm-udeb
 hw-detect-full
-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
-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
+input-modules-2.4.27-sb1-swarm-bn-di
+ipv6-modules-2.4.27-r4k-ip22-di
+ipv6-modules-2.4.27-r5k-ip22-di
+ipv6-modules-2.4.27-sb1-swarm-bn-di
+jfs-modules-2.4.27-r4k-ip22-di
+jfs-modules-2.4.27-r5k-ip22-di
+jfs-modules-2.4.27-sb1-swarm-bn-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
@@ -847,24 +928,27 @@ libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
-loop-modules-2.4.26-sb1-swarm-bn-di
+loop-modules-2.4.27-sb1-swarm-bn-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-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
+md-modules-2.4.27-r4k-ip22-di
+md-modules-2.4.27-r5k-ip22-di
+md-modules-2.4.27-sb1-swarm-bn-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
 mii-diag-udeb
+mkreiser4-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
 network-console
+network-preseed
 nobootloader
+ntfstools-udeb
 openssh-client-udeb
 openssh-server-udeb
 os-prober
@@ -886,22 +970,25 @@ partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
-pcmcia-storage-modules-2.4.26-sb1-swarm-bn-di
-ppp-modules-2.4.26-sb1-swarm-bn-di
+pcmcia-storage-modules-2.4.27-sb1-swarm-bn-di
+ppp-modules-2.4.27-sb1-swarm-bn-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-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
+reiser4progs-udeb
+reiserfs-modules-2.4.27-r4k-ip22-di
+reiserfs-modules-2.4.27-r5k-ip22-di
+reiserfs-modules-2.4.27-sb1-swarm-bn-di
+sata-modules-2.4.27-sb1-swarm-bn-di
+scsi-common-modules-2.4.27-sb1-swarm-bn-di
+scsi-core-modules-2.4.27-sb1-swarm-bn-di
+scsi-modules-2.4.27-sb1-swarm-bn-di
+sibyl-installer
+usb-modules-2.4.27-sb1-swarm-bn-di
+usb-storage-modules-2.4.27-sb1-swarm-bn-di
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.4.26-sb1-swarm-bn-di
+xfs-modules-2.4.27-sb1-swarm-bn-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_mips */
@@ -915,8 +1002,8 @@ bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-cdrom-core-modules-2.4.26-r5k-cobalt-di
-cdrom-core-modules-2.4.26-sb1-swarm-bn-di
+cdrom-core-modules-2.4.27-r5k-cobalt-di
+cdrom-core-modules-2.4.27-sb1-swarm-bn-di
 choose-mirror
 cobalt-scripts
 colo-installer
@@ -943,17 +1030,20 @@ e2fsprogs-udeb
 eject-udeb
 ethdetect
 evms-udeb
-fat-modules-2.4.26-r5k-cobalt-di
-fat-modules-2.4.26-sb1-swarm-bn-di
+fat-modules-2.4.27-r5k-cobalt-di
+fat-modules-2.4.27-sb1-swarm-bn-di
+fb-modules-2.4.27-sb1-swarm-bn-di
 fbset-udeb
 fdisk-udeb
+hdparm-udeb
 hw-detect-full
-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
-jfs-modules-2.4.26-r5k-cobalt-di
-jfs-modules-2.4.26-sb1-swarm-bn-di
+input-modules-2.4.27-sb1-swarm-bn-di
+ipv6-modules-2.4.27-r3k-kn02-di
+ipv6-modules-2.4.27-r4k-kn04-di
+ipv6-modules-2.4.27-r5k-cobalt-di
+ipv6-modules-2.4.27-sb1-swarm-bn-di
+jfs-modules-2.4.27-r5k-cobalt-di
+jfs-modules-2.4.27-sb1-swarm-bn-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
@@ -969,26 +1059,29 @@ libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
-loop-modules-2.4.26-r5k-cobalt-di
-loop-modules-2.4.26-sb1-swarm-bn-di
+loop-modules-2.4.27-r5k-cobalt-di
+loop-modules-2.4.27-sb1-swarm-bn-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
-md-modules-2.4.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
+md-modules-2.4.27-r3k-kn02-di
+md-modules-2.4.27-r4k-kn04-di
+md-modules-2.4.27-r5k-cobalt-di
+md-modules-2.4.27-sb1-swarm-bn-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
 mii-diag-udeb
+mkreiser4-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
 network-console
+network-preseed
 nobootloader
+ntfstools-udeb
 openssh-client-udeb
 openssh-server-udeb
 os-prober
@@ -1009,44 +1102,47 @@ partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
-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
+pcmcia-storage-modules-2.4.27-sb1-swarm-bn-di
+ppp-modules-2.4.27-r5k-cobalt-di
+ppp-modules-2.4.27-sb1-swarm-bn-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-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
+reiser4progs-udeb
+reiserfs-modules-2.4.27-r3k-kn02-di
+reiserfs-modules-2.4.27-r4k-kn04-di
+reiserfs-modules-2.4.27-r5k-cobalt-di
+reiserfs-modules-2.4.27-sb1-swarm-bn-di
+sata-modules-2.4.27-sb1-swarm-bn-di
+scsi-common-modules-2.4.27-sb1-swarm-bn-di
+scsi-core-modules-2.4.27-sb1-swarm-bn-di
+scsi-modules-2.4.27-sb1-swarm-bn-di
+sibyl-installer
+usb-modules-2.4.27-sb1-swarm-bn-di
+usb-storage-modules-2.4.27-sb1-swarm-bn-di
 userdevfs
 wireless-tools-udeb
-xfs-modules-2.4.26-r5k-cobalt-di
-xfs-modules-2.4.26-sb1-swarm-bn-di
+xfs-modules-2.4.27-r5k-cobalt-di
+xfs-modules-2.4.27-sb1-swarm-bn-di
 xfsprogs-udeb
 zlib1g-udeb
 #endif /* ARCH_mipsel */
 #ifdef ARCH_powerpc
-affs-modules-2.4.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.7-power3-di
-affs-modules-2.6.7-power4-di
-affs-modules-2.6.7-powerpc-di
+affs-modules-2.4.27-power3-di
+affs-modules-2.4.27-power4-di
+affs-modules-2.4.27-powerpc-di
+affs-modules-2.4.27-powerpc-small-di
+affs-modules-2.6.8-power3-di
+affs-modules-2.6.8-power4-di
+affs-modules-2.6.8-powerpc-di
 archdetect
 autopartkit
 base-installer
 baseconfig-udeb
-brltty-modules-2.4.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-modules-2.4.27-power3-di
+brltty-modules-2.4.27-power4-di
+brltty-modules-2.4.27-powerpc-di
+brltty-modules-2.4.27-powerpc-small-di
 brltty-udeb
 bterm-unifont
 bugreporter-udeb
@@ -1067,68 +1163,70 @@ dmsetup-udeb
 e2fsprogs-udeb
 ethdetect
 evms-udeb
-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.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.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
+ext2-modules-2.6.8-power3-di
+ext2-modules-2.6.8-power4-di
+ext2-modules-2.6.8-powerpc-di
+ext3-modules-2.4.27-powerpc-small-di
+ext3-modules-2.6.8-power3-di
+ext3-modules-2.6.8-power4-di
+ext3-modules-2.6.8-powerpc-di
+fat-modules-2.4.27-power3-di
+fat-modules-2.4.27-power4-di
+fat-modules-2.6.8-power3-di
+fat-modules-2.6.8-power4-di
+fat-modules-2.6.8-powerpc-di
+fb-modules-2.4.27-power3-di
+fb-modules-2.4.27-power4-di
+fb-modules-2.4.27-powerpc-di
+fb-modules-2.4.27-powerpc-small-di
+fb-modules-2.6.8-power3-di
+fb-modules-2.6.8-power4-di
+fb-modules-2.6.8-powerpc-di
 fbset-udeb
 fdisk-udeb
-firmware-modules-2.6.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.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.7-power3-di
-hfs-modules-2.6.7-power4-di
-hfs-modules-2.6.7-powerpc-di
+firmware-modules-2.6.8-power3-di
+firmware-modules-2.6.8-power4-di
+firmware-modules-2.6.8-powerpc-di
+floppy-modules-2.4.27-power3-di
+floppy-modules-2.4.27-power4-di
+floppy-modules-2.4.27-powerpc-di
+floppy-modules-2.4.27-powerpc-small-di
+floppy-modules-2.6.8-power3-di
+floppy-modules-2.6.8-power4-di
+floppy-modules-2.6.8-powerpc-di
+hdparm-udeb
+hfs-modules-2.4.27-power3-di
+hfs-modules-2.4.27-power4-di
+hfs-modules-2.4.27-powerpc-di
+hfs-modules-2.4.27-powerpc-small-di
+hfs-modules-2.6.8-power3-di
+hfs-modules-2.6.8-power4-di
+hfs-modules-2.6.8-powerpc-di
 hw-detect-full
-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.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.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
-isa-pnp-modules-2.4.25-powerpc-small-di
+ipv6-modules-2.4.27-power3-di
+ipv6-modules-2.4.27-power4-di
+ipv6-modules-2.4.27-powerpc-di
+ipv6-modules-2.4.27-powerpc-small-di
+ipv6-modules-2.6.8-power3-di
+ipv6-modules-2.6.8-power4-di
+ipv6-modules-2.6.8-powerpc-di
+irda-modules-2.4.27-power3-di
+irda-modules-2.4.27-power4-di
+irda-modules-2.4.27-powerpc-di
+irda-modules-2.4.27-powerpc-small-di
+irda-modules-2.6.8-power3-di
+irda-modules-2.6.8-power4-di
+irda-modules-2.6.8-powerpc-di
+isa-pnp-modules-2.4.27-power3-di
+isa-pnp-modules-2.4.27-power4-di
+isa-pnp-modules-2.4.27-powerpc-di
+isa-pnp-modules-2.4.27-powerpc-small-di
 jfs-modules-2.4.25-apus-di
-jfs-modules-2.4.25-powerpc-small-di
-jfs-modules-2.6.7-power3-di
-jfs-modules-2.6.7-power4-di
-jfs-modules-2.6.7-powerpc-di
+jfs-modules-2.4.27-apus-di
+jfs-modules-2.4.27-powerpc-small-di
+jfs-modules-2.6.8-power3-di
+jfs-modules-2.6.8-power4-di
+jfs-modules-2.6.8-powerpc-di
 jfsutils-udeb
 libblkid1-udeb
 libc6-udeb
@@ -1143,13 +1241,13 @@ libnss-files-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.7-power3-di
-loop-modules-2.6.7-power4-di
-loop-modules-2.6.7-powerpc-di
+loop-modules-2.4.27-power3-di
+loop-modules-2.4.27-power4-di
+loop-modules-2.4.27-powerpc-di
+loop-modules-2.4.27-powerpc-small-di
+loop-modules-2.6.8-power3-di
+loop-modules-2.6.8-power4-di
+loop-modules-2.6.8-powerpc-di
 lowmem
 lvm10-udeb
 lvm2-udeb
@@ -1157,56 +1255,62 @@ 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.7-power3-di
-md-modules-2.6.7-power4-di
-md-modules-2.6.7-powerpc-di
+md-modules-2.4.27-apus-di
+md-modules-2.4.27-power3-di
+md-modules-2.4.27-power4-di
+md-modules-2.4.27-powerpc-di
+md-modules-2.4.27-powerpc-small-di
+md-modules-2.6.8-power3-di
+md-modules-2.6.8-power4-di
+md-modules-2.6.8-powerpc-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
 mii-diag-udeb
+mkreiser4-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
 network-console
-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.7-power3-di
-nic-extra-modules-2.6.7-power4-di
-nic-extra-modules-2.6.7-powerpc-di
+network-preseed
+nic-extra-modules-2.4.27-power3-di
+nic-extra-modules-2.4.27-power4-di
+nic-extra-modules-2.4.27-powerpc-di
+nic-extra-modules-2.4.27-powerpc-small-di
+nic-extra-modules-2.6.8-power3-di
+nic-extra-modules-2.6.8-power4-di
+nic-extra-modules-2.6.8-powerpc-di
 nic-modules-2.4.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.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.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.7-power3-di
-nic-shared-modules-2.6.7-power4-di
-nic-shared-modules-2.6.7-powerpc-di
+nic-modules-2.4.27-apus-di
+nic-modules-2.4.27-power3-di
+nic-modules-2.4.27-power4-di
+nic-modules-2.4.27-powerpc-di
+nic-modules-2.4.27-powerpc-small-di
+nic-modules-2.6.8-power3-di
+nic-modules-2.6.8-power4-di
+nic-modules-2.6.8-powerpc-di
+nic-pcmcia-modules-2.4.27-power3-di
+nic-pcmcia-modules-2.4.27-power4-di
+nic-pcmcia-modules-2.4.27-powerpc-di
+nic-pcmcia-modules-2.4.27-powerpc-small-di
+nic-pcmcia-modules-2.6.8-power3-di
+nic-pcmcia-modules-2.6.8-power4-di
+nic-pcmcia-modules-2.6.8-powerpc-di
+nic-shared-modules-2.4.27-power3-di
+nic-shared-modules-2.4.27-power4-di
+nic-shared-modules-2.4.27-powerpc-di
+nic-shared-modules-2.4.27-powerpc-small-di
+nic-shared-modules-2.6.8-power3-di
+nic-shared-modules-2.6.8-power4-di
+nic-shared-modules-2.6.8-powerpc-di
 nobootloader
+ntfstools-udeb
 openssh-client-udeb
 openssh-server-udeb
 os-prober
 parport-modules-2.4.25-apus-di
-parport-modules-2.4.25-powerpc-small-di
+parport-modules-2.4.27-apus-di
+parport-modules-2.4.27-powerpc-small-di
 partconf-find-partitions
 partconf-mkfstab
 parted-udeb
@@ -1224,50 +1328,52 @@ partman-reiserfs
 partman-target
 partman-xfs
 plip-modules-2.4.25-apus-di
-plip-modules-2.4.25-power3-di
-plip-modules-2.4.25-power4-di
-plip-modules-2.4.25-powerpc-di
-plip-modules-2.4.25-powerpc-small-di
+plip-modules-2.4.27-apus-di
+plip-modules-2.4.27-power3-di
+plip-modules-2.4.27-power4-di
+plip-modules-2.4.27-powerpc-di
+plip-modules-2.4.27-powerpc-small-di
 pmac-fdisk-udeb
-ppp-modules-2.4.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.7-power3-di
-ppp-modules-2.6.7-power4-di
-ppp-modules-2.6.7-powerpc-di
+ppp-modules-2.4.27-power3-di
+ppp-modules-2.4.27-power4-di
+ppp-modules-2.4.27-powerpc-di
+ppp-modules-2.4.27-powerpc-small-di
+ppp-modules-2.6.8-power3-di
+ppp-modules-2.6.8-power4-di
+ppp-modules-2.6.8-powerpc-di
 ppp-udeb
 prebaseconfig
 quik-installer
 raidtools2-udeb
-reiserfs-modules-2.4.25-powerpc-small-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.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.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.7-power3-di
-ufs-modules-2.6.7-power4-di
-ufs-modules-2.6.7-powerpc-di
+reiser4progs-udeb
+reiserfs-modules-2.4.27-powerpc-small-di
+reiserfs-modules-2.6.8-power3-di
+reiserfs-modules-2.6.8-power4-di
+reiserfs-modules-2.6.8-powerpc-di
+sata-modules-2.6.8-power3-di
+sata-modules-2.6.8-power4-di
+sata-modules-2.6.8-powerpc-di
+scsi-extra-modules-2.4.27-powerpc-small-di
+scsi-extra-modules-2.6.8-power3-di
+scsi-extra-modules-2.6.8-power4-di
+scsi-extra-modules-2.6.8-powerpc-di
+serial-modules-2.4.27-powerpc-di
+serial-modules-2.4.27-powerpc-small-di
+serial-modules-2.6.8-power3-di
+serial-modules-2.6.8-power4-di
+serial-modules-2.6.8-powerpc-di
+ufs-modules-2.4.27-power3-di
+ufs-modules-2.4.27-power4-di
+ufs-modules-2.4.27-powerpc-di
+ufs-modules-2.4.27-powerpc-small-di
+ufs-modules-2.6.8-power3-di
+ufs-modules-2.6.8-power4-di
+ufs-modules-2.6.8-powerpc-di
 wireless-tools-udeb
-xfs-modules-2.4.25-powerpc-small-di
-xfs-modules-2.6.7-power3-di
-xfs-modules-2.6.7-power4-di
-xfs-modules-2.6.7-powerpc-di
+xfs-modules-2.4.27-powerpc-small-di
+xfs-modules-2.6.8-power3-di
+xfs-modules-2.6.8-power4-di
+xfs-modules-2.6.8-powerpc-di
 xfsprogs-udeb
 yaboot-installer
 zlib1g-udeb
@@ -1306,6 +1412,7 @@ ethdetect
 evms-udeb
 fbset-udeb
 fdisk-udeb
+hdparm-udeb
 hw-detect-full
 jfsutils-udeb
 libblkid1-udeb
@@ -1326,16 +1433,19 @@ lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
+md-modules-2.4.27-1-s390-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
 mii-diag-udeb
+mkreiser4-udeb
 mkreiserfs-udeb
 net-retriever
 network-console
-nic-modules-2.4.21-1-s390-di
-nic-modules-2.4.26-1-s390-di
+network-preseed
+nic-modules-2.4.27-1-s390-di
 nobootloader
+ntfstools-udeb
 openssh-client-udeb
 openssh-server-udeb
 os-prober
@@ -1359,15 +1469,15 @@ partman-xfs
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
+reiser4progs-udeb
 s390-dasd
 s390-netdevice
 s390-tools-udeb
-scsi-core-modules-2.4.21-1-s390-di
-scsi-core-modules-2.4.26-1-s390-di
-scsi-modules-2.4.21-1-s390-di
-scsi-modules-2.4.26-1-s390-di
+scsi-core-modules-2.4.27-1-s390-di
+scsi-modules-2.4.27-1-s390-di
 userdevfs
 wireless-tools-udeb
+xfs-modules-2.4.27-1-s390-di
 xfsprogs-udeb
 zipl-installer
 zlib1g-udeb
@@ -1382,8 +1492,10 @@ bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
-cdrom-core-modules-2.4.26-sparc32-di
-cdrom-core-modules-2.4.26-sparc64-di
+cdrom-core-modules-2.4.27-1-sparc32-di
+cdrom-core-modules-2.4.27-1-sparc64-di
+cdrom-core-modules-2.6.8-1-sparc32-di
+cdrom-core-modules-2.6.8-1-sparc64-di
 choose-mirror
 console-keymaps-acorn
 console-keymaps-amiga
@@ -1406,11 +1518,24 @@ e2fsprogs-udeb
 eject-udeb
 ethdetect
 evms-udeb
+ext3-modules-2.4.27-1-sparc32-di
+ext3-modules-2.4.27-1-sparc64-di
+ext3-modules-2.6.8-1-sparc32-di
+ext3-modules-2.6.8-1-sparc64-di
+fat-modules-2.6.8-1-sparc32-di
+fat-modules-2.6.8-1-sparc64-di
 fbset-udeb
 fdisk-udeb
+firewire-core-modules-2.4.27-1-sparc64-di
+firmware-modules-2.4.27-1-sparc64-di
+hdparm-udeb
 hw-detect-full
-ipv6-modules-2.4.26-sparc32-di
-ipv6-modules-2.4.26-sparc64-di
+ide-modules-2.4.27-1-sparc64-di
+ide-modules-2.6.8-1-sparc64-di
+ipv6-modules-2.4.27-1-sparc32-di
+ipv6-modules-2.4.27-1-sparc64-di
+ipv6-modules-2.6.8-1-sparc32-di
+ipv6-modules-2.6.8-1-sparc64-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
@@ -1426,23 +1551,33 @@ libnss-files-udeb
 libparted1.6-udeb
 libreiserfs0.3-udeb
 libuuid1-udeb
+loop-modules-2.4.27-1-sparc32-di
+loop-modules-2.4.27-1-sparc64-di
 lowmem
 lvm10-udeb
 lvm2-udeb
 lvmcfg
 lvmcfg-utils
+md-modules-2.4.27-1-sparc32-di
+md-modules-2.4.27-1-sparc64-di
+md-modules-2.6.8-1-sparc32-di
+md-modules-2.6.8-1-sparc64-di
 mdadm-udeb
 mdcfg
 mdcfg-utils
 mii-diag-udeb
+mkreiser4-udeb
 mkreiserfs-udeb
 net-retriever
 netcfg
 network-console
-nic-pci-modules-2.4.26-sparc64-di
-nic-sbus-modules-2.4.26-sparc32-di
-nic-sbus-modules-2.4.26-sparc64-di
+network-preseed
+nic-modules-2.4.27-1-sparc32-di
+nic-modules-2.4.27-1-sparc64-di
+nic-modules-2.6.8-1-sparc32-di
+nic-modules-2.6.8-1-sparc64-di
 nobootloader
+ntfstools-udeb
 openssh-client-udeb
 openssh-server-udeb
 os-prober
@@ -1462,14 +1597,72 @@ partman-reiserfs
 partman-target
 partman-xfs
 pcmcia-cs-udeb
-ppp-modules-2.4.26-sparc32-di
-ppp-modules-2.4.26-sparc64-di
+plip-modules-2.6.8-1-sparc32-di
+plip-modules-2.6.8-1-sparc64-di
+ppp-modules-2.4.27-1-sparc32-di
+ppp-modules-2.4.27-1-sparc64-di
+ppp-modules-2.6.8-1-sparc32-di
+ppp-modules-2.6.8-1-sparc64-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
+reiser4progs-udeb
+reiserfs-modules-2.4.27-1-sparc32-di
+reiserfs-modules-2.4.27-1-sparc64-di
+reiserfs-modules-2.6.8-1-sparc32-di
+reiserfs-modules-2.6.8-1-sparc64-di
+scsi-common-modules-2.6.8-1-sparc32-di
+scsi-common-modules-2.6.8-1-sparc64-di
+scsi-core-modules-2.4.27-1-sparc32-di
+scsi-core-modules-2.4.27-1-sparc64-di
+scsi-core-modules-2.6.8-1-sparc32-di
+scsi-core-modules-2.6.8-1-sparc64-di
+scsi-modules-2.4.27-1-sparc32-di
+scsi-modules-2.4.27-1-sparc64-di
 silo-installer
 userdevfs
 wireless-tools-udeb
+xfs-modules-2.4.27-1-sparc32-di
+xfs-modules-2.4.27-1-sparc64-di
+xfs-modules-2.6.8-1-sparc32-di
+xfs-modules-2.6.8-1-sparc64-di
 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
+lowmem
+lvmcfg
+lvmcfg-utils
+mdcfg
+mdcfg-utils
+net-retriever
+network-preseed
+nobootloader
+partman-auto
+partman-basicfilesystems
+partman-basicmethods
+partman-ext3
+partman-jfs
+partman-lvm
+partman-md
+partman-reiserfs
+partman-target
+partman-xfs
+prebaseconfig
+userdevfs
+#endif /* ARCH_sh */
diff --git a/tasks/debian-installer+kernel b/tasks/debian-installer+kernel
index 1f99a901..c0d353ab 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: Mon Sep 27 15:44:57 MDT 2004
+ * Last update: Wed Oct  6 05:36:00 MDT 2004
  */
 
 #include <debian-installer>
@@ -46,8 +46,6 @@ aboot-base
 discover1
 kernel-image-2.4-generic
 kernel-image-2.4-smp
-kernel-image-2.4.26-1-generic
-kernel-image-2.4.26-1-smp
 kernel-image-2.4.27-1-generic
 kernel-image-2.4.27-1-smp
 kernel-image-2.6-generic
@@ -120,10 +118,6 @@ 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
-kernel-image-2.4.26-sparc64-smp
 kernel-image-2.4.27-1-sparc32
 kernel-image-2.4.27-1-sparc32-smp
 kernel-image-2.4.27-1-sparc64
diff --git a/tools/boot/sarge/boot-alpha.calc b/tools/boot/sarge/boot-alpha.calc
new file mode 100644
index 00000000..0ffaca87
--- /dev/null
+++ b/tools/boot/sarge/boot-alpha.calc
@@ -0,0 +1,13 @@
+BOOT_SIZE_1=12
+BOOT_SIZE_10=2
+BOOT_SIZE_11=2
+BOOT_SIZE_12=2
+BOOT_SIZE_13=2
+BOOT_SIZE_2=2
+BOOT_SIZE_3=2
+BOOT_SIZE_4=2
+BOOT_SIZE_5=2
+BOOT_SIZE_6=2
+BOOT_SIZE_7=2
+BOOT_SIZE_8=2
+BOOT_SIZE_9=2
diff --git a/tools/boot/sarge/boot-arm.calc b/tools/boot/sarge/boot-arm.calc
new file mode 100644
index 00000000..211d6845
--- /dev/null
+++ b/tools/boot/sarge/boot-arm.calc
@@ -0,0 +1,12 @@
+BOOT_SIZE_1=17
+BOOT_SIZE_10=2
+BOOT_SIZE_11=2
+BOOT_SIZE_12=2
+BOOT_SIZE_2=2
+BOOT_SIZE_3=2
+BOOT_SIZE_4=2
+BOOT_SIZE_5=2
+BOOT_SIZE_6=2
+BOOT_SIZE_7=2
+BOOT_SIZE_8=2
+BOOT_SIZE_9=2
diff --git a/tools/boot/sarge/boot-hppa.calc b/tools/boot/sarge/boot-hppa.calc
new file mode 100644
index 00000000..e2a05a58
--- /dev/null
+++ b/tools/boot/sarge/boot-hppa.calc
@@ -0,0 +1,13 @@
+BOOT_SIZE_1=19
+BOOT_SIZE_10=2
+BOOT_SIZE_11=2
+BOOT_SIZE_12=2
+BOOT_SIZE_13=2
+BOOT_SIZE_2=2
+BOOT_SIZE_3=2
+BOOT_SIZE_4=2
+BOOT_SIZE_5=2
+BOOT_SIZE_6=2
+BOOT_SIZE_7=2
+BOOT_SIZE_8=2
+BOOT_SIZE_9=2
diff --git a/tools/boot/sarge/boot-i386.calc b/tools/boot/sarge/boot-i386.calc
new file mode 100644
index 00000000..c7738ead
--- /dev/null
+++ b/tools/boot/sarge/boot-i386.calc
@@ -0,0 +1,14 @@
+BOOT_SIZE_1=27
+BOOT_SIZE_10=2
+BOOT_SIZE_11=2
+BOOT_SIZE_12=2
+BOOT_SIZE_13=2
+BOOT_SIZE_14=2
+BOOT_SIZE_2=4
+BOOT_SIZE_3=2
+BOOT_SIZE_4=2
+BOOT_SIZE_5=2
+BOOT_SIZE_6=2
+BOOT_SIZE_7=2
+BOOT_SIZE_8=2
+BOOT_SIZE_9=2
diff --git a/tools/boot/sarge/boot-ia64.calc b/tools/boot/sarge/boot-ia64.calc
new file mode 100644
index 00000000..fc6644b3
--- /dev/null
+++ b/tools/boot/sarge/boot-ia64.calc
@@ -0,0 +1,14 @@
+BOOT_SIZE_1=18
+BOOT_SIZE_10=2
+BOOT_SIZE_11=2
+BOOT_SIZE_12=2
+BOOT_SIZE_13=2
+BOOT_SIZE_14=2
+BOOT_SIZE_2=2
+BOOT_SIZE_3=2
+BOOT_SIZE_4=2
+BOOT_SIZE_5=2
+BOOT_SIZE_6=2
+BOOT_SIZE_7=2
+BOOT_SIZE_8=2
+BOOT_SIZE_9=2
diff --git a/tools/boot/sarge/boot-m68k.calc b/tools/boot/sarge/boot-m68k.calc
index 59fbb078..aa02a817 100644
--- a/tools/boot/sarge/boot-m68k.calc
+++ b/tools/boot/sarge/boot-m68k.calc
@@ -1,6 +1,24 @@
-SIZE_MULT_1=88
-#BOOT_SIZE_1=36
-#BOOT_SIZE_2=40
-#BOOT_SIZE_3=40
-#BOOT_SIZE_4=40
-#BOOT_SIZE_5=40
+BOOT_SIZE_1=21
+SIZE_MULT_1=97
+BOOT_SIZE_10=2
+SIZE_MULT_10=97
+BOOT_SIZE_11=2
+SIZE_MULT_11=97
+BOOT_SIZE_12=2
+SIZE_MULT_12=97
+BOOT_SIZE_2=2
+SIZE_MULT_2=97
+BOOT_SIZE_3=2
+SIZE_MULT_3=97
+BOOT_SIZE_4=2
+SIZE_MULT_4=97
+BOOT_SIZE_5=2
+SIZE_MULT_5=97
+BOOT_SIZE_6=2
+SIZE_MULT_6=97
+BOOT_SIZE_7=2
+SIZE_MULT_7=97
+BOOT_SIZE_8=2
+SIZE_MULT_8=97
+BOOT_SIZE_9=2
+SIZE_MULT_9=97
diff --git a/tools/boot/sarge/boot-mips.calc b/tools/boot/sarge/boot-mips.calc
new file mode 100644
index 00000000..528f4754
--- /dev/null
+++ b/tools/boot/sarge/boot-mips.calc
@@ -0,0 +1,12 @@
+BOOT_SIZE_1=16
+BOOT_SIZE_10=2
+BOOT_SIZE_11=2
+BOOT_SIZE_12=2
+BOOT_SIZE_2=2
+BOOT_SIZE_3=2
+BOOT_SIZE_4=2
+BOOT_SIZE_5=2
+BOOT_SIZE_6=2
+BOOT_SIZE_7=2
+BOOT_SIZE_8=2
+BOOT_SIZE_9=2
diff --git a/tools/boot/sarge/boot-mipsel.calc b/tools/boot/sarge/boot-mipsel.calc
new file mode 100644
index 00000000..664e4baf
--- /dev/null
+++ b/tools/boot/sarge/boot-mipsel.calc
@@ -0,0 +1,12 @@
+BOOT_SIZE_1=15
+BOOT_SIZE_10=2
+BOOT_SIZE_11=2
+BOOT_SIZE_12=2
+BOOT_SIZE_2=2
+BOOT_SIZE_3=2
+BOOT_SIZE_4=2
+BOOT_SIZE_5=2
+BOOT_SIZE_6=2
+BOOT_SIZE_7=2
+BOOT_SIZE_8=2
+BOOT_SIZE_9=2
diff --git a/tools/boot/sarge/boot-powerpc.calc b/tools/boot/sarge/boot-powerpc.calc
index a3efdc91..b0c0a276 100644
--- a/tools/boot/sarge/boot-powerpc.calc
+++ b/tools/boot/sarge/boot-powerpc.calc
@@ -1,2 +1,15 @@
-#BOOT_SIZE_1=65
-SIZE_MULT_1=90
+BOOT_SIZE_1=65
+BOOT_SIZE_10=2
+BOOT_SIZE_11=2
+BOOT_SIZE_12=2
+BOOT_SIZE_13=2
+BOOT_SIZE_14=2
+BOOT_SIZE_2=2
+BOOT_SIZE_3=2
+BOOT_SIZE_4=2
+BOOT_SIZE_5=2
+BOOT_SIZE_6=2
+BOOT_SIZE_7=2
+BOOT_SIZE_8=2
+BOOT_SIZE_9=2
+SIZE_MULT_1=93
diff --git a/tools/boot/sarge/boot-s390.calc b/tools/boot/sarge/boot-s390.calc
new file mode 100644
index 00000000..aa3d67e3
--- /dev/null
+++ b/tools/boot/sarge/boot-s390.calc
@@ -0,0 +1,13 @@
+BOOT_SIZE_1=7
+BOOT_SIZE_10=2
+BOOT_SIZE_11=2
+BOOT_SIZE_12=2
+BOOT_SIZE_13=2
+BOOT_SIZE_2=2
+BOOT_SIZE_3=2
+BOOT_SIZE_4=2
+BOOT_SIZE_5=2
+BOOT_SIZE_6=2
+BOOT_SIZE_7=2
+BOOT_SIZE_8=2
+BOOT_SIZE_9=2
diff --git a/tools/boot/sarge/boot-sparc.calc b/tools/boot/sarge/boot-sparc.calc
index 661e94a5..32b8c618 100644
--- a/tools/boot/sarge/boot-sparc.calc
+++ b/tools/boot/sarge/boot-sparc.calc
@@ -1 +1,13 @@
-BOOT_SIZE_1=10
+BOOT_SIZE_1=14
+BOOT_SIZE_10=2
+BOOT_SIZE_11=2
+BOOT_SIZE_12=2
+BOOT_SIZE_13=2
+BOOT_SIZE_2=2
+BOOT_SIZE_3=2
+BOOT_SIZE_4=2
+BOOT_SIZE_5=2
+BOOT_SIZE_6=2
+BOOT_SIZE_7=2
+BOOT_SIZE_8=2
+BOOT_SIZE_9=2
diff --git a/tools/calc b/tools/calc
new file mode 100755
index 00000000..dca7c58f
--- /dev/null
+++ b/tools/calc
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# This script tries to get good estimations into the .calc files at
+# boot/$CODENAME/boot-$ARCH.calc, so you can use it whenever you want to
+# update these .calc files with more recent estimations.
+
+# It uses info taken from the temporary dir of a previous build for $ARCH,
+# $CODENAME. This doesn't need to be a full build, you can get the needed
+# stuff by running a build.sh with something like:
+# IMAGETARGET="ok bootable upgrade bin-infos bin-list"
+
+# Temporary directory of the previous build.
+BDIR="$TDIR/$CODENAME-$ARCH"
+
+#Get info from older build if it exists
+if [ -d "$BDIR" ];
+then
+  echo Estimated sizes:
+  rm -f "boot/$CODENAME/boot-$ARCH.calc"
+  for i in `du -sm "$BDIR"/CD[0123456789]* |
+              sed -n 's/^\([0-9]\+\).*CD\([0-9]\+\)/\2=\1/p'`
+  do
+    #space used by boot images in megs (this has an error of up to a mega)
+    if [ -d "$BDIR/boot${i%=*}" ]
+    then
+      imgdu=`du -sm "$BDIR/boot${i%=*}" |
+               sed -n 's/^\([0-9]\+\).*/\1/p'`
+    else
+      imgdu=1
+    fi
+    #add it all up and write it to the .calc file
+    echo BOOT_SIZE_${i%=*}=${i#*=}+$imgdu
+    echo BOOT_SIZE_${i%=*}=$((${i#*=}+$imgdu)) >> "boot/$CODENAME/boot-$ARCH.calc"
+    case "$ARCH" in
+      m68k)	echo SIZE_MULT_${i%=*}=97 >> "boot/$CODENAME/boot-$ARCH.calc";;
+    esac
+  done
+fi
+case "$ARCH" in
+  powerpc)     echo SIZE_MULT_1=93 >> "boot/$CODENAME/boot-$ARCH.calc";;
+esac