diff --git a/debian/changelog b/debian/changelog
index 43542e62..8afe7440 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,46 @@ debian-cd (2.2.21) UNRELEASED; urgency=low
     - Make i386 cds 8.3 filenaming compatible again.
     - Workaround the two kernels problem on hppa.
     - Fix the kernel-image-2.4.27-amiga thing on generate_di+k_list.
+  * Joey Hess again:
+    - Since amd64 is not on standard debian mirrors, and generate_d-i+k_list
+      must be runnable on them, make it chack for absence of amd64 Packages
+      files and add a dummy kernel for amd64. This will need to be manually
+      kept up-to-date by the amd64 people for now.
+    - Didn't fix generate_di_list the same way, since doing so would be too
+      hard. Next time tasks/debian-installer is updated using this script on
+      a machine w/o the unofficial amd64 archive, the am64 info in the file
+      will be lost.
+    - Add DO NOT EDIT warning messages to generated files in cvs.
+    - Check and revert manual modifications to tasks/base-sarge. This file is
+      automatically generated and those mods would have been lost:
+        - Add fileutils to generate_d-i+k_list, "until kernels get fixed",
+          whatever that means.
+        - arcboot was already in generate_d-i+k_list.
+    - Update tasks/debian-installer+kernel using generate_d-i+k_list.
+    - Sort package lists in tasks/base-sarge to ease comparisons when
+      updating.
+    - Update tasks/base-sarge for debootstrap 0.2.45. This includes the
+      following removals:
+         - aboot: already listed in debian-installer+kernel
+         - gcc-3.2-base, libdb2, libgcrypt1, libgnutls7, libident, 
+           libdb2, libtasn1-0: obsolete
+         - modconf: obsoleted by d-i
+         - setserial: not base anymore
+         - slang1: turned into slang1a-utf8
+         - libident: not needed by base anymore
+         - lilo: in debian-installer+kernel
+         - mbr: not installed anymore
+         - pcmcia-cs: in debian-installer+kernel
+         - syslinux: not installed
+         - "filesutils": typo; fileutils in generate_d-i+k_list for m68k
+         - quik: in debian-installer+kernel
+         - yaboot: in debian-installer+kernel
+         - arcboot: in debian-installer+kernel
+         - delo: in debian-installer+kernel
+      And the following additions:
+         - libdb4.2, libgcrypt11, libgcrypt7, libgnutls10, libgnutls11,
+           libgpg-error0, libtasn1-2: new libraries
+         - console-tools: now installed by debootstrap even on s390
 
  -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2004 03:03:36 -0400
 
diff --git a/tasks/base-sarge b/tasks/base-sarge
index 33e90b9b..39812b41 100644
--- a/tasks/base-sarge
+++ b/tasks/base-sarge
@@ -1,4 +1,3 @@
-
 /*
  * This file lists the packages needed by debootstrap
  *
@@ -10,1584 +9,1552 @@
 for arch in alpha amd64 arm i386 ia64 m68k powerpc sparc mips mipsel hppa s390
 do
     echo "#ifdef ARCH_$arch"
-    debootstrap --arch $arch --print-debs $CODENAME | tr ' ' '\n' | grep -v "^$"
+    debootstrap --arch $arch --print-debs $CODENAME | tr ' ' '\n' | grep -v "^$" | sort
     echo "#endif"
     echo ""
 done
 
- *
- * Latest update : in sync with debootstrap 0.2.23
- *
- * -- Raphael Hertzog
- *
+ * Latest update : in sync with debootstrap 0.2.45
+ * 
+ * DO NOT EDIT ANYTHING BELOW BY HAND
  */
 
-
 #ifdef ARCH_alpha
+adduser
+apt
+apt-utils
+aptitude
+at
+base-config
 base-files
 base-passwd
 bash
+bsdmainutils
 bsdutils
+console-common
+console-data
+console-tools
 coreutils
-libacl1
-libattr1
+cpio
+cron
 debconf
 debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
 debianutils
+dhcp-client
 diff
 dpkg
 dselect
-libblkid1
-e2fsprogs
 e2fslibs
-libcomerr2
-libss2
-libuuid1
+e2fsprogs
+ed
+exim4
+exim4-base
+exim4-config
+exim4-daemon-light
+fdutils
 findutils
+gcc-3.3-base
+gettext-base
 grep
+groff-base
 gzip
 hostname
-libcap1
-libdb1-compat
-libdb2
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libperl5.8
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
-perl-base
-procps
-sed
-slang1
-slang1a-utf8
+ifupdown
+info
 initscripts
-sysvinit
-sysv-rc
-tar
-util-linux
-whiptail
-libgcc1
-gcc-3.2-base
-gcc-3.3-base
-libstdc++5
+ipchains
+iputils-ping
+klogd
+libacl1
+libattr1
+libblkid1
 libc6.1
-adduser
-apt
-apt-utils
-at
-base-config
-aptitude
-libsigc++-1.2-5c102
-bsdmainutils
-console-common
-console-tools
+libcap1
+libcomerr2
 libconsole
-console-data
-cpio
-cron
-dhcp-client
-ed
-exim4
-exim4-base
-exim4-config
-exim4-daemon-light
-fdutils
-gettext-base
-groff-base
-ifupdown
-info
-klogd
-libident
-libgnutls7
-libssl0.9.7
-libgcrypt1
-liblzo1
-libopencdk8
-libtasn1-0
-zlib1g
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+liblocale-gettext-perl
 liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libpcap0.7
 libpcre3
+libperl5.8
+libpopt0
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
 libwrap0
+login
 logrotate
 mailx
+makedev
 man-db
-libgdbm3
 manpages
-modconf
+mawk
+modutils
+mount
 nano
+ncurses-base
+ncurses-bin
 net-tools
 netbase
 netkit-inetd
-iputils-ping
 nvi
-ppp
-pppconfig
-pppoe
-pppoeconf
-libpcap0.7
-sysklogd
-tasksel
-libtextwrap1
-tcpd
-telnet
-libtext-iconv-perl
-wget
-setserial
-aboot
+passwd
 pciutils
-ipchains
-#endif
-
-#ifdef ARCH_arm
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-libacl1
-libattr1
-debconf
-debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
-debianutils
-diff
-dpkg
-dselect
-libblkid1
-e2fsprogs
-e2fslibs
-libcomerr2
-libss2
-libuuid1
-findutils
-grep
-gzip
-hostname
-libcap1
-libc6
-libdb1-compat
-libdb2
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libperl5.8
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
 perl-base
-procps
-sed
-slang1
-slang1a-utf8
-initscripts
-sysvinit
-sysv-rc
-tar
-util-linux
-whiptail
-libgcc1
-gcc-3.2-base
-gcc-3.3-base
-libstdc++5
-adduser
-apt
-apt-utils
-at
-base-config
-aptitude
-libsigc++-1.2-5c102
-bsdmainutils
-console-common
-console-tools
-libconsole
-console-data
-cpio
-cron
-dhcp-client
-ed
-exim4
-exim4-base
-exim4-config
-exim4-daemon-light
-fdutils
-gettext-base
-groff-base
-ifupdown
-info
-klogd
-libident
-libgnutls7
-libssl0.9.7
-libgcrypt1
-liblzo1
-libopencdk8
-libtasn1-0
-zlib1g
-liblockfile1
-libpcre3
-libwrap0
-logrotate
-mailx
-man-db
-libgdbm3
-manpages
-modconf
-nano
-net-tools
-netbase
-netkit-inetd
-iputils-ping
-nvi
 ppp
 pppconfig
 pppoe
 pppoeconf
-libpcap0.7
-sysklogd
-tasksel
-libtextwrap1
-tcpd
-telnet
-libtext-iconv-perl
-wget
-setserial
-libgpmg1
-ipchains
-iptables
-#endif
-
-#ifdef ARCH_i386
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-libacl1
-libattr1
-debconf
-debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
-debianutils
-diff
-dpkg
-dselect
-libblkid1
-e2fsprogs
-e2fslibs
-libcomerr2
-libss2
-libuuid1
-findutils
-grep
-gzip
-hostname
-libcap1
-libc6
-libdb1-compat
-libdb2
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
-perl-base
 procps
 sed
-slang1
 slang1a-utf8
-initscripts
-sysvinit
-sysv-rc
-tar
-util-linux
-whiptail
-libgcc1
-gcc-3.2-base
-gcc-3.3-base
-libstdc++5
-mbr
-adduser
-apt
-apt-utils
-at
-base-config
-aptitude
-libsigc++-1.2-5c102
-bsdmainutils
-console-common
-console-tools
-libconsole
-console-data
-cpio
-cron
-dhcp-client
-ed
-exim4
-exim4-base
-exim4-config
-exim4-daemon-light
-fdutils
-gettext-base
-groff-base
-ifupdown
-info
-klogd
-libident
-libgnutls7
-libssl0.9.7
-libgcrypt1
-liblzo1
-libopencdk8
-libtasn1-0
-zlib1g
-liblockfile1
-libpcre3
-libwrap0
-logrotate
-mailx
-man-db
-libgdbm3
-manpages
-modconf
-nano
-net-tools
-netbase
-netkit-inetd
-iputils-ping
-nvi
-ppp
-pppconfig
-pppoe
-pppoeconf
-libpcap0.7
 sysklogd
+sysv-rc
+sysvinit
+tar
 tasksel
-libtextwrap1
 tcpd
 telnet
-libtext-iconv-perl
-wget
-lilo
-pciutils
-setserial
-syslinux
-psmisc
-pcmcia-cs
-ipchains
-iptables
-#endif
-
-#ifdef ARCH_ia64
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-libacl1
-libattr1
-debconf
-debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
-debianutils
-diff
-dpkg
-dselect
-libblkid1
-e2fsprogs
-e2fslibs
-libcomerr2
-libss2
-libuuid1
-findutils
-grep
-gzip
-hostname
-libcap1
-libdb1-compat
-libdb2
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libperl5.8
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
-perl-base
-procps
-sed
-slang1
-slang1a-utf8
-initscripts
-sysvinit
-sysv-rc
-tar
 util-linux
-whiptail
-libgcc1
-gcc-3.2-base
-gcc-3.3-base
-libstdc++5
-libc6.1
-libreadline4
-adduser
-apt
-apt-utils
-at
-base-config
-aptitude
-libsigc++-1.2-5c102
-bsdmainutils
-console-common
-console-tools
-libconsole
-console-data
-cpio
-cron
-dhcp-client
-ed
-exim4
-exim4-base
-exim4-config
-exim4-daemon-light
-fdutils
-gettext-base
-groff-base
-ifupdown
-info
-klogd
-libident
-libgnutls7
-libssl0.9.7
-libgcrypt1
-liblzo1
-libopencdk8
-libtasn1-0
-zlib1g
-liblockfile1
-libpcre3
-libwrap0
-logrotate
-mailx
-man-db
-libgdbm3
-manpages
-modconf
-nano
-net-tools
-netbase
-netkit-inetd
-iputils-ping
-nvi
-ppp
-pppconfig
-pppoe
-pppoeconf
-libpcap0.7
-sysklogd
-tasksel
-libtextwrap1
-tcpd
-telnet
-libtext-iconv-perl
 wget
-elilo
-efibootmgr
-dosfstools
-libparted1.6-0
-parted
-iptables
-#endif
-
-#ifdef ARCH_m68k
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-libacl1
-libattr1
-debconf
-debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
-debianutils
-diff
-dpkg
-dselect
-libblkid1
-e2fsprogs
-e2fslibs
-libcomerr2
-libss2
-libuuid1
-fileutils
-findutils
-grep
-gzip
-hostname
-libcap1
-libc6
-libdb1-compat
-libdb2
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libperl5.8
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
-perl-base
-procps
-sed
-slang1
-slang1a-utf8
-initscripts
-sysvinit
-sysv-rc
-tar
-util-linux
 whiptail
-libgcc1
-gcc-3.2-base
-gcc-3.3-base
-libstdc++5
-libreadline4
-libreadline4
-adduser
-apt
-apt-utils
-at
-base-config
-aptitude
-libsigc++-1.2-5c102
-bsdmainutils
-console-common
-console-tools
-libconsole
-console-data
-cpio
-cron
-dhcp-client
-ed
-exim4
-exim4-base
-exim4-config
-exim4-daemon-light
-fdutils
-gettext-base
-groff-base
-ifupdown
-info
-klogd
-libident
-libgnutls7
-libssl0.9.7
-libgcrypt1
-liblzo1
-libopencdk8
-libtasn1-0
 zlib1g
-liblockfile1
-libpcre3
-libwrap0
-logrotate
-mailx
-man-db
-libgdbm3
-manpages
-modconf
-nano
-net-tools
-netbase
-netkit-inetd
-iputils-ping
-nvi
-ppp
-pppconfig
-pppoe
-pppoeconf
-libpcap0.7
-sysklogd
-tasksel
-libtextwrap1
-tcpd
-telnet
-libtext-iconv-perl
-wget
-atari-bootstrap
-atari-fdisk
-amiga-fdisk
-eject
-mac-fdisk
-pmac-fdisk-cross
-setserial
-vmelilo
-ipchains
-filesutils
-#endif
-
-#ifdef ARCH_powerpc
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-libacl1
-libattr1
-debconf
-debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
-debianutils
-diff
-dpkg
-dselect
-libblkid1
-e2fsprogs
-e2fslibs
-libcomerr2
-libss2
-libuuid1
-findutils
-grep
-gzip
-hostname
-libcap1
-libc6
-libdb1-compat
-libdb2
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libperl5.8
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
-perl-base
-procps
-sed
-slang1
-slang1a-utf8
-initscripts
-sysvinit
-sysv-rc
-tar
-util-linux
-whiptail
-libgcc1
-gcc-3.2-base
-gcc-3.3-base
-libstdc++5
-libreadline4
-adduser
-apt
-apt-utils
-at
-base-config
-aptitude
-libsigc++-1.2-5c102
-bsdmainutils
-console-common
-console-tools
-libconsole
-console-data
-cpio
-cron
-dhcp-client
-ed
-exim4
-exim4-base
-exim4-config
-exim4-daemon-light
-fdutils
-gettext-base
-groff-base
-ifupdown
-info
-klogd
-libident
-libgnutls7
-libssl0.9.7
-libgcrypt1
-liblzo1
-libopencdk8
-libtasn1-0
-zlib1g
-liblockfile1
-libpcre3
-libwrap0
-logrotate
-mailx
-man-db
-libgdbm3
-manpages
-modconf
-nano
-net-tools
-netbase
-netkit-inetd
-iputils-ping
-nvi
-ppp
-pppconfig
-pppoe
-pppoeconf
-libpcap0.7
-sysklogd
-tasksel
-libtextwrap1
-tcpd
-telnet
-libtext-iconv-perl
-wget
-quik
-mac-fdisk
-amiga-fdisk
-psmisc
-powerpc-utils
-setserial
-pciutils
-hfsutils
-yaboot
-pcmcia-cs
-ipchains
-iptables
-#endif
-
-#ifdef ARCH_sparc
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-libacl1
-libattr1
-debconf
-debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
-debianutils
-diff
-dpkg
-dselect
-libblkid1
-e2fsprogs
-e2fslibs
-libcomerr2
-libss2
-libuuid1
-findutils
-grep
-gzip
-hostname
-libcap1
-libc6
-libdb1-compat
-libdb2
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libperl5.8
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
-perl-base
-procps
-sed
-slang1
-slang1a-utf8
-initscripts
-sysvinit
-sysv-rc
-tar
-util-linux
-whiptail
-libgcc1
-gcc-3.2-base
-gcc-3.3-base
-libstdc++5
-adduser
-apt
-apt-utils
-at
-base-config
-aptitude
-libsigc++-1.2-5c102
-bsdmainutils
-console-common
-console-tools
-libconsole
-console-data
-cpio
-cron
-dhcp-client
-ed
-exim4
-exim4-base
-exim4-config
-exim4-daemon-light
-fdutils
-gettext-base
-groff-base
-ifupdown
-info
-klogd
-libident
-libgnutls7
-libssl0.9.7
-libgcrypt1
-liblzo1
-libopencdk8
-libtasn1-0
-zlib1g
-liblockfile1
-libpcre3
-libwrap0
-logrotate
-mailx
-man-db
-libgdbm3
-manpages
-modconf
-nano
-net-tools
-netbase
-netkit-inetd
-iputils-ping
-nvi
-ppp
-pppconfig
-pppoe
-pppoeconf
-libpcap0.7
-sysklogd
-tasksel
-libtextwrap1
-tcpd
-telnet
-libtext-iconv-perl
-wget
-silo
-eject
-pciutils
-sparc-utils
-ipchains
-iptables
-#endif
-
-#ifdef ARCH_mips
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-libacl1
-libattr1
-debconf
-debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
-debianutils
-diff
-dpkg
-dselect
-libblkid1
-e2fsprogs
-e2fslibs
-libcomerr2
-libss2
-libuuid1
-findutils
-grep
-gzip
-hostname
-libcap1
-libc6
-libdb1-compat
-libdb2
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libperl5.8
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
-perl-base
-procps
-sed
-slang1
-slang1a-utf8
-initscripts
-sysvinit
-sysv-rc
-tar
-util-linux
-whiptail
-libgcc1
-gcc-3.2-base
-gcc-3.3-base
-libstdc++5
-adduser
-apt
-apt-utils
-at
-base-config
-aptitude
-libsigc++-1.2-5c102
-bsdmainutils
-console-common
-console-tools
-libconsole
-console-data
-cpio
-cron
-dhcp-client
-ed
-exim4
-exim4-base
-exim4-config
-exim4-daemon-light
-fdutils
-gettext-base
-groff-base
-ifupdown
-info
-klogd
-libident
-libgnutls7
-libssl0.9.7
-libgcrypt1
-liblzo1
-libopencdk8
-libtasn1-0
-zlib1g
-liblockfile1
-libpcre3
-libwrap0
-logrotate
-mailx
-man-db
-libgdbm3
-manpages
-modconf
-nano
-net-tools
-netbase
-netkit-inetd
-iputils-ping
-nvi
-ppp
-pppconfig
-pppoe
-pppoeconf
-libpcap0.7
-sysklogd
-tasksel
-libtextwrap1
-tcpd
-telnet
-libtext-iconv-perl
-wget
-dvhtool
-arcboot
-pciutils
-setserial
-iptables
-#endif
-
-#ifdef ARCH_mipsel
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-libacl1
-libattr1
-debconf
-debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
-debianutils
-diff
-dpkg
-dselect
-libblkid1
-e2fsprogs
-e2fslibs
-libcomerr2
-libss2
-libuuid1
-findutils
-grep
-gzip
-hostname
-libcap1
-libc6
-libdb1-compat
-libdb2
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libperl5.8
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
-perl-base
-procps
-sed
-slang1
-slang1a-utf8
-initscripts
-sysvinit
-sysv-rc
-tar
-util-linux
-whiptail
-libgcc1
-gcc-3.2-base
-gcc-3.3-base
-libstdc++5
-adduser
-apt
-apt-utils
-at
-base-config
-aptitude
-libsigc++-1.2-5c102
-bsdmainutils
-console-common
-console-tools
-libconsole
-console-data
-cpio
-cron
-dhcp-client
-ed
-exim4
-exim4-base
-exim4-config
-exim4-daemon-light
-fdutils
-gettext-base
-groff-base
-ifupdown
-info
-klogd
-libident
-libgnutls7
-libssl0.9.7
-libgcrypt1
-liblzo1
-libopencdk8
-libtasn1-0
-zlib1g
-liblockfile1
-libpcre3
-libwrap0
-logrotate
-mailx
-man-db
-libgdbm3
-manpages
-modconf
-nano
-net-tools
-netbase
-netkit-inetd
-iputils-ping
-nvi
-ppp
-pppconfig
-pppoe
-pppoeconf
-libpcap0.7
-sysklogd
-tasksel
-libtextwrap1
-tcpd
-telnet
-libtext-iconv-perl
-wget
-delo
-pciutils
-setserial
-iptables
-#endif
-
-#ifdef ARCH_hppa
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-libacl1
-libattr1
-debconf
-debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
-debianutils
-diff
-dpkg
-dselect
-libblkid1
-e2fsprogs
-e2fslibs
-libcomerr2
-libss2
-libuuid1
-findutils
-grep
-gzip
-hostname
-libcap1
-libc6
-libdb1-compat
-libdb2
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libperl5.8
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
-perl-base
-procps
-sed
-slang1
-slang1a-utf8
-initscripts
-sysvinit
-sysv-rc
-tar
-util-linux
-whiptail
-libgcc1
-gcc-3.2-base
-gcc-3.3-base
-libstdc++5
-adduser
-apt
-apt-utils
-at
-base-config
-aptitude
-libsigc++-1.2-5c102
-bsdmainutils
-console-common
-console-tools
-libconsole
-console-data
-cpio
-cron
-dhcp-client
-ed
-exim4
-exim4-base
-exim4-config
-exim4-daemon-light
-fdutils
-gettext-base
-groff-base
-ifupdown
-info
-klogd
-libident
-libgnutls7
-libssl0.9.7
-libgcrypt1
-liblzo1
-libopencdk8
-libtasn1-0
-zlib1g
-liblockfile1
-libpcre3
-libwrap0
-logrotate
-mailx
-man-db
-libgdbm3
-manpages
-modconf
-nano
-net-tools
-netbase
-netkit-inetd
-iputils-ping
-nvi
-ppp
-pppconfig
-pppoe
-pppoeconf
-libpcap0.7
-sysklogd
-tasksel
-libtextwrap1
-tcpd
-telnet
-libtext-iconv-perl
-wget
-palo
-libstdc++3
-gcc-3.0-base
-iptables
-#endif
-
-#ifdef ARCH_s390
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-libacl1
-libattr1
-debconf
-debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
-debianutils
-diff
-dpkg
-dselect
-libblkid1
-e2fsprogs
-e2fslibs
-libcomerr2
-libss2
-libuuid1
-findutils
-grep
-gzip
-hostname
-libcap1
-libc6
-libdb1-compat
-libdb2
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libperl5.8
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
-perl-base
-procps
-sed
-slang1
-slang1a-utf8
-initscripts
-sysvinit
-sysv-rc
-tar
-util-linux
-whiptail
-libgcc1
-gcc-3.2-base
-gcc-3.3-base
-libstdc++5
-adduser
-apt
-apt-utils
-at
-base-config
-aptitude
-libsigc++-1.2-5c102
-bsdmainutils
-console-common
-libconsole
-console-data
-cpio
-cron
-dhcp-client
-ed
-exim4
-exim4-base
-exim4-config
-exim4-daemon-light
-gettext-base
-groff-base
-ifupdown
-info
-klogd
-libident
-libgnutls7
-libssl0.9.7
-libgcrypt1
-liblzo1
-libopencdk8
-libtasn1-0
-zlib1g
-liblockfile1
-libpcre3
-libwrap0
-logrotate
-mailx
-man-db
-libgdbm3
-manpages
-modconf
-nano
-net-tools
-netbase
-netkit-inetd
-iputils-ping
-nvi
-libpcap0.7
-sysklogd
-tasksel
-libtextwrap1
-tcpd
-telnet
-libtext-iconv-perl
-wget
-s390-tools
-telnetd
-devfsd
-iptables
 #endif
 
 #ifdef ARCH_amd64
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-libacl1
-libattr1
-debconf
-debconf-i18n
-liblocale-gettext-perl
-libtext-wrapi18n-perl
-libtext-charwidth-perl
-debianutils
-diff
-dpkg
-dselect
-libblkid1
-e2fsprogs
-e2fslibs
-libcomerr2
-libss2
-libuuid1
-findutils
-grep
-gzip
-hostname
-libcap1
-libc6
-libdb1-compat
-libdb3
-libncurses5
-libnewt0.51
-libpam-modules
-libpam-runtime
-libpam0g
-libperl5.8
-libpopt0
-login
-makedev
-mawk
-modutils
-mount
-ncurses-base
-ncurses-bin
-passwd
-perl-base
-procps
-sed
-slang1a-utf8
-initscripts
-sysvinit
-sysv-rc
-tar
-util-linux
-whiptail
-libgcc1
-gcc-3.3-base
-libstdc++5
-libtext-iconv-perl
-zlib1g
 adduser
 apt
 apt-utils
-libdb4.2
+aptitude
 at
 base-config
-aptitude
-libsigc++-1.2-5c102
+base-files
+base-passwd
+bash
 bsdmainutils
+bsdutils
 console-common
-console-tools
-libconsole
 console-data
+console-tools
+coreutils
 cpio
 cron
+debconf
+debconf-i18n
+debianutils
 dhcp-client
+diff
+dpkg
+dselect
+e2fslibs
+e2fsprogs
 ed
 exim4
 exim4-base
 exim4-config
 exim4-daemon-light
-libgnutls10
-libgcrypt7
-libgpg-error0
-libopencdk8
-libtasn1-2
 fdutils
+findutils
+gcc-3.3-base
 gettext-base
+grep
 groff-base
+gzip
+hostname
 ifupdown
 info
+initscripts
+iptables
+iputils-ping
 klogd
-libssl0.9.7
-liblzo1
-zlib1g
+libacl1
+libattr1
+libblkid1
+libc6
+libcap1
+libcomerr2
+libconsole
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+liblocale-gettext-perl
 liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libpcap0.7
 libpcre3
+libperl5.8
+libpopt0
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
 libwrap0
+login
 logrotate
 mailx
+makedev
 man-db
-libgdbm3
 manpages
+mawk
+modutils
+mount
 nano
+ncurses-base
+ncurses-bin
 net-tools
 netbase
 netkit-inetd
-iputils-ping
 nvi
+passwd
+pciutils
+perl-base
 ppp
 pppconfig
 pppoe
 pppoeconf
-libpcap0.7
+procps
+psmisc
+sed
+slang1a-utf8
 sysklogd
+sysv-rc
+sysvinit
+tar
 tasksel
-libtextwrap1
 tcpd
 telnet
-libtext-iconv-perl
+util-linux
 wget
-pciutils
-setserial
-psmisc
-iptables
+whiptail
+zlib1g
+zlib1g
 #endif
+
+#ifdef ARCH_arm
+adduser
+apt
+apt-utils
+aptitude
+at
+base-config
+base-files
+base-passwd
+bash
+bsdmainutils
+bsdutils
+console-common
+console-data
+console-tools
+coreutils
+cpio
+cron
+debconf
+debconf-i18n
+debianutils
+dhcp-client
+diff
+dpkg
+dselect
+e2fslibs
+e2fsprogs
+ed
+exim4
+exim4-base
+exim4-config
+exim4-daemon-light
+fdutils
+findutils
+gcc-3.3-base
+gettext-base
+grep
+groff-base
+gzip
+hostname
+ifupdown
+info
+initscripts
+ipchains
+iptables
+iputils-ping
+klogd
+libacl1
+libattr1
+libblkid1
+libc6
+libcap1
+libcomerr2
+libconsole
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+libgpmg1
+liblocale-gettext-perl
+liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libpcap0.7
+libpcre3
+libperl5.8
+libpopt0
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
+libwrap0
+login
+logrotate
+mailx
+makedev
+man-db
+manpages
+mawk
+modutils
+mount
+nano
+ncurses-base
+ncurses-bin
+net-tools
+netbase
+netkit-inetd
+nvi
+passwd
+perl-base
+ppp
+pppconfig
+pppoe
+pppoeconf
+procps
+sed
+slang1a-utf8
+sysklogd
+sysv-rc
+sysvinit
+tar
+tasksel
+tcpd
+telnet
+util-linux
+wget
+whiptail
+zlib1g
+#endif
+
+#ifdef ARCH_i386
+adduser
+apt
+apt-utils
+aptitude
+at
+base-config
+base-files
+base-passwd
+bash
+bsdmainutils
+bsdutils
+console-common
+console-data
+console-tools
+coreutils
+cpio
+cron
+debconf
+debconf-i18n
+debianutils
+dhcp-client
+diff
+dpkg
+dselect
+e2fslibs
+e2fsprogs
+ed
+exim4
+exim4-base
+exim4-config
+exim4-daemon-light
+fdutils
+findutils
+gcc-3.3-base
+gettext-base
+grep
+groff-base
+gzip
+hostname
+ifupdown
+info
+initscripts
+ipchains
+iptables
+iputils-ping
+klogd
+libacl1
+libattr1
+libblkid1
+libc6
+libcap1
+libcomerr2
+libconsole
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+liblocale-gettext-perl
+liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libpcap0.7
+libpcre3
+libpopt0
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
+libwrap0
+login
+logrotate
+mailx
+makedev
+man-db
+manpages
+mawk
+modutils
+mount
+nano
+ncurses-base
+ncurses-bin
+net-tools
+netbase
+netkit-inetd
+nvi
+passwd
+pciutils
+perl-base
+ppp
+pppconfig
+pppoe
+pppoeconf
+procps
+psmisc
+sed
+slang1a-utf8
+sysklogd
+sysv-rc
+sysvinit
+tar
+tasksel
+tcpd
+telnet
+util-linux
+wget
+whiptail
+zlib1g
+#endif
+
+#ifdef ARCH_ia64
+adduser
+apt
+apt-utils
+aptitude
+at
+base-config
+base-files
+base-passwd
+bash
+bsdmainutils
+bsdutils
+console-common
+console-data
+console-tools
+coreutils
+cpio
+cron
+debconf
+debconf-i18n
+debianutils
+dhcp-client
+diff
+dosfstools
+dpkg
+dselect
+e2fslibs
+e2fsprogs
+ed
+efibootmgr
+elilo
+exim4
+exim4-base
+exim4-config
+exim4-daemon-light
+fdutils
+findutils
+gcc-3.3-base
+gettext-base
+grep
+groff-base
+gzip
+hostname
+ifupdown
+info
+initscripts
+iptables
+iputils-ping
+klogd
+libacl1
+libattr1
+libblkid1
+libc6.1
+libcap1
+libcomerr2
+libconsole
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+liblocale-gettext-perl
+liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libparted1.6-0
+libpcap0.7
+libpcre3
+libperl5.8
+libpopt0
+libreadline4
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
+libwrap0
+login
+logrotate
+mailx
+makedev
+man-db
+manpages
+mawk
+modutils
+mount
+nano
+ncurses-base
+ncurses-bin
+net-tools
+netbase
+netkit-inetd
+nvi
+parted
+passwd
+perl-base
+ppp
+pppconfig
+pppoe
+pppoeconf
+procps
+sed
+slang1a-utf8
+sysklogd
+sysv-rc
+sysvinit
+tar
+tasksel
+tcpd
+telnet
+util-linux
+wget
+whiptail
+zlib1g
+#endif
+
+#ifdef ARCH_m68k
+adduser
+amiga-fdisk
+apt
+apt-utils
+aptitude
+at
+atari-bootstrap
+atari-fdisk
+base-config
+base-files
+base-passwd
+bash
+bsdmainutils
+bsdutils
+console-common
+console-data
+console-tools
+coreutils
+cpio
+cron
+debconf
+debconf-i18n
+debianutils
+dhcp-client
+diff
+dpkg
+dselect
+e2fslibs
+e2fsprogs
+ed
+eject
+exim4
+exim4-base
+exim4-config
+exim4-daemon-light
+fdutils
+findutils
+gcc-3.3-base
+gettext-base
+grep
+groff-base
+gzip
+hostname
+ifupdown
+info
+initscripts
+ipchains
+iputils-ping
+klogd
+libacl1
+libattr1
+libblkid1
+libc6
+libcap1
+libcomerr2
+libconsole
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+liblocale-gettext-perl
+liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libpcap0.7
+libpcre3
+libperl5.8
+libpopt0
+libreadline4
+libreadline4
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
+libwrap0
+login
+logrotate
+mac-fdisk
+mailx
+makedev
+man-db
+manpages
+mawk
+modutils
+mount
+nano
+ncurses-base
+ncurses-bin
+net-tools
+netbase
+netkit-inetd
+nvi
+passwd
+perl-base
+pmac-fdisk-cross
+ppp
+pppconfig
+pppoe
+pppoeconf
+procps
+sed
+slang1a-utf8
+sysklogd
+sysv-rc
+sysvinit
+tar
+tasksel
+tcpd
+telnet
+util-linux
+vmelilo
+wget
+whiptail
+zlib1g
+#endif
+
+#ifdef ARCH_powerpc
+adduser
+amiga-fdisk
+apt
+apt-utils
+aptitude
+at
+base-config
+base-files
+base-passwd
+bash
+bsdmainutils
+bsdutils
+console-common
+console-data
+console-tools
+coreutils
+cpio
+cron
+debconf
+debconf-i18n
+debianutils
+dhcp-client
+diff
+dpkg
+dselect
+e2fslibs
+e2fsprogs
+ed
+exim4
+exim4-base
+exim4-config
+exim4-daemon-light
+fdutils
+findutils
+gcc-3.3-base
+gettext-base
+grep
+groff-base
+gzip
+hfsutils
+hostname
+ifupdown
+info
+initscripts
+ipchains
+iptables
+iputils-ping
+klogd
+libacl1
+libattr1
+libblkid1
+libc6
+libcap1
+libcomerr2
+libconsole
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+liblocale-gettext-perl
+liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libpcap0.7
+libpcre3
+libperl5.8
+libpopt0
+libreadline4
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
+libwrap0
+login
+logrotate
+mac-fdisk
+mailx
+makedev
+man-db
+manpages
+mawk
+modutils
+mount
+nano
+ncurses-base
+ncurses-bin
+net-tools
+netbase
+netkit-inetd
+nvi
+passwd
+pciutils
+perl-base
+powerpc-utils
+ppp
+pppconfig
+pppoe
+pppoeconf
+procps
+psmisc
+sed
+slang1a-utf8
+sysklogd
+sysv-rc
+sysvinit
+tar
+tasksel
+tcpd
+telnet
+util-linux
+wget
+whiptail
+zlib1g
+#endif
+
+#ifdef ARCH_sparc
+adduser
+apt
+apt-utils
+aptitude
+at
+base-config
+base-files
+base-passwd
+bash
+bsdmainutils
+bsdutils
+console-common
+console-data
+console-tools
+coreutils
+cpio
+cron
+debconf
+debconf-i18n
+debianutils
+dhcp-client
+diff
+dpkg
+dselect
+e2fslibs
+e2fsprogs
+ed
+eject
+exim4
+exim4-base
+exim4-config
+exim4-daemon-light
+fdutils
+findutils
+gcc-3.3-base
+gettext-base
+grep
+groff-base
+gzip
+hostname
+ifupdown
+info
+initscripts
+ipchains
+iptables
+iputils-ping
+klogd
+libacl1
+libattr1
+libblkid1
+libc6
+libcap1
+libcomerr2
+libconsole
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+liblocale-gettext-perl
+liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libpcap0.7
+libpcre3
+libperl5.8
+libpopt0
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
+libwrap0
+login
+logrotate
+mailx
+makedev
+man-db
+manpages
+mawk
+modutils
+mount
+nano
+ncurses-base
+ncurses-bin
+net-tools
+netbase
+netkit-inetd
+nvi
+passwd
+pciutils
+perl-base
+ppp
+pppconfig
+pppoe
+pppoeconf
+procps
+sed
+silo
+slang1a-utf8
+sparc-utils
+sysklogd
+sysv-rc
+sysvinit
+tar
+tasksel
+tcpd
+telnet
+util-linux
+wget
+whiptail
+zlib1g
+#endif
+
+#ifdef ARCH_mips
+adduser
+apt
+apt-utils
+aptitude
+at
+base-config
+base-files
+base-passwd
+bash
+bsdmainutils
+bsdutils
+console-common
+console-data
+console-tools
+coreutils
+cpio
+cron
+debconf
+debconf-i18n
+debianutils
+dhcp-client
+diff
+dpkg
+dselect
+dvhtool
+e2fslibs
+e2fsprogs
+ed
+exim4
+exim4-base
+exim4-config
+exim4-daemon-light
+fdutils
+findutils
+gcc-3.3-base
+gettext-base
+grep
+groff-base
+gzip
+hostname
+ifupdown
+info
+initscripts
+iptables
+iputils-ping
+klogd
+libacl1
+libattr1
+libblkid1
+libc6
+libcap1
+libcomerr2
+libconsole
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+liblocale-gettext-perl
+liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libpcap0.7
+libpcre3
+libperl5.8
+libpopt0
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
+libwrap0
+login
+logrotate
+mailx
+makedev
+man-db
+manpages
+mawk
+modutils
+mount
+nano
+ncurses-base
+ncurses-bin
+net-tools
+netbase
+netkit-inetd
+nvi
+passwd
+pciutils
+perl-base
+ppp
+pppconfig
+pppoe
+pppoeconf
+procps
+sed
+slang1a-utf8
+sysklogd
+sysv-rc
+sysvinit
+tar
+tasksel
+tcpd
+telnet
+util-linux
+wget
+whiptail
+zlib1g
+#endif
+
+#ifdef ARCH_mipsel
+adduser
+apt
+apt-utils
+aptitude
+at
+base-config
+base-files
+base-passwd
+bash
+bsdmainutils
+bsdutils
+console-common
+console-data
+console-tools
+coreutils
+cpio
+cron
+debconf
+debconf-i18n
+debianutils
+dhcp-client
+diff
+dpkg
+dselect
+e2fslibs
+e2fsprogs
+ed
+exim4
+exim4-base
+exim4-config
+exim4-daemon-light
+fdutils
+findutils
+gcc-3.3-base
+gettext-base
+grep
+groff-base
+gzip
+hostname
+ifupdown
+info
+initscripts
+iptables
+iputils-ping
+klogd
+libacl1
+libattr1
+libblkid1
+libc6
+libcap1
+libcomerr2
+libconsole
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+liblocale-gettext-perl
+liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libpcap0.7
+libpcre3
+libperl5.8
+libpopt0
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
+libwrap0
+login
+logrotate
+mailx
+makedev
+man-db
+manpages
+mawk
+modutils
+mount
+nano
+ncurses-base
+ncurses-bin
+net-tools
+netbase
+netkit-inetd
+nvi
+passwd
+pciutils
+perl-base
+ppp
+pppconfig
+pppoe
+pppoeconf
+procps
+sed
+slang1a-utf8
+sysklogd
+sysv-rc
+sysvinit
+tar
+tasksel
+tcpd
+telnet
+util-linux
+wget
+whiptail
+zlib1g
+#endif
+
+#ifdef ARCH_hppa
+adduser
+apt
+apt-utils
+aptitude
+at
+base-config
+base-files
+base-passwd
+bash
+bsdmainutils
+bsdutils
+console-common
+console-data
+console-tools
+coreutils
+cpio
+cron
+debconf
+debconf-i18n
+debianutils
+dhcp-client
+diff
+dpkg
+dselect
+e2fslibs
+e2fsprogs
+ed
+exim4
+exim4-base
+exim4-config
+exim4-daemon-light
+fdutils
+findutils
+gcc-3.3-base
+gettext-base
+grep
+groff-base
+gzip
+hostname
+ifupdown
+info
+initscripts
+iptables
+iputils-ping
+klogd
+libacl1
+libattr1
+libblkid1
+libc6
+libcap1
+libcomerr2
+libconsole
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+liblocale-gettext-perl
+liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libpcap0.7
+libpcre3
+libperl5.8
+libpopt0
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
+libwrap0
+login
+logrotate
+mailx
+makedev
+man-db
+manpages
+mawk
+modutils
+mount
+nano
+ncurses-base
+ncurses-bin
+net-tools
+netbase
+netkit-inetd
+nvi
+palo
+passwd
+perl-base
+ppp
+pppconfig
+pppoe
+pppoeconf
+procps
+sed
+slang1a-utf8
+sysklogd
+sysv-rc
+sysvinit
+tar
+tasksel
+tcpd
+telnet
+util-linux
+wget
+whiptail
+zlib1g
+#endif
+
+#ifdef ARCH_s390
+adduser
+apt
+apt-utils
+aptitude
+at
+base-config
+base-files
+base-passwd
+bash
+bsdmainutils
+bsdutils
+console-common
+console-data
+console-tools
+coreutils
+cpio
+cron
+debconf
+debconf-i18n
+debianutils
+devfsd
+dhcp-client
+diff
+dpkg
+dselect
+e2fslibs
+e2fsprogs
+ed
+exim4
+exim4-base
+exim4-config
+exim4-daemon-light
+findutils
+gcc-3.3-base
+gettext-base
+grep
+groff-base
+gzip
+hostname
+ifupdown
+info
+initscripts
+iptables
+iputils-ping
+klogd
+libacl1
+libattr1
+libblkid1
+libc6
+libcap1
+libcomerr2
+libconsole
+libdb1-compat
+libdb3
+libdb4.2
+libgcc1
+libgcrypt11
+libgcrypt7
+libgdbm3
+libgnutls10
+libgnutls11
+libgpg-error0
+liblocale-gettext-perl
+liblockfile1
+liblzo1
+libncurses5
+libnewt0.51
+libopencdk8
+libpam-modules
+libpam-runtime
+libpam0g
+libpcap0.7
+libpcre3
+libperl5.8
+libpopt0
+libsigc++-1.2-5c102
+libss2
+libssl0.9.7
+libstdc++5
+libtasn1-2
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtextwrap1
+libuuid1
+libwrap0
+login
+logrotate
+mailx
+makedev
+man-db
+manpages
+mawk
+modutils
+mount
+nano
+ncurses-base
+ncurses-bin
+net-tools
+netbase
+netkit-inetd
+nvi
+passwd
+perl-base
+procps
+s390-tools
+sed
+slang1a-utf8
+sysklogd
+sysv-rc
+sysvinit
+tar
+tasksel
+tcpd
+telnet
+telnetd
+util-linux
+wget
+whiptail
+zlib1g
+#endif
+
diff --git a/tasks/debian-installer+kernel b/tasks/debian-installer+kernel
index d6811a72..360b8110 100644
--- a/tasks/debian-installer+kernel
+++ b/tasks/debian-installer+kernel
@@ -1,11 +1,13 @@
 /* These files + the ones needed by debootstrap are the ones needed for
- * debian-installer to be able to complete the installation of the base.
- * at least at this pre-sarge days.
+ * debian-installer to be able to complete the installation of the base
+ * system.
  *
  * This list can be generated with the command:
  * ../tools/generate_di+k_list
  *
- * Last update: Sun Nov 21 16:22:02 MST 2004
+ * DO NOT EDIT THIS FILE, edit the above script
+ *
+ * Last update: Sun Jan  2 15:53:58 MST 2005
  */
 
 #include <debian-installer>
@@ -133,6 +135,7 @@ kernel-image-2.6.8-1-sparc64
 kernel-image-2.6.8-1-sparc64-smp
 #endif
 #ifdef ARCH_m68k
+fileutils
 kernel-image-2.2.25-mac
 kernel-image-2.4.27-amiga
 kernel-image-2.4.27-atari
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index b2e20c24..771e6f9e 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -7,12 +7,14 @@
 DATE=`date`
 cat > debian-installer+kernel << EOF
 /* These files + the ones needed by debootstrap are the ones needed for
- * debian-installer to be able to complete the installation of the base.
- * at least at this pre-sarge days.
+ * debian-installer to be able to complete the installation of the base
+ * system.
  *
  * This list can be generated with the command:
  * ../tools/generate_di+k_list
  *
+ * DO NOT EDIT THIS FILE, edit the above script
+ *
  * Last update: $DATE
  */
 
@@ -61,13 +63,18 @@ cat >> debian-installer+kernel << EOF
 #ifdef ARCH_amd64
 EOF
 
-/bin/sed -n 's/Package: \(kernel-image-2.6.*-generic\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
-  >> debian-installer+kernel
-/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.6.*-generic\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
-  >> debian-installer+kernel
-
+if [ ! -e $MIRROR/dists/$CODENAME/main/binary-amd64/Packages ]; then
+	echo "Cannot find amd64 packages file, inserting static entry as workaround" >&2
+	echo kernel-image-2.6.8-9-amd64-generic >> debian-installer+kernel
+else
+	/bin/sed -n 's/Package: \(kernel-image-2.6.*-generic\)$/\1/p' \
+	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
+	  >> debian-installer+kernel
+	/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.6.*-generic\)$/\1/p' \
+	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
+	  >> debian-installer+kernel
+fi
+	 
 cat >> debian-installer+kernel << EOF
 #endif
 #ifdef ARCH_alpha
@@ -173,6 +180,7 @@ EOF
 cat >> debian-installer+kernel << EOF
 #endif
 #ifdef ARCH_m68k
+fileutils
 EOF
 
 # Get all the 2.2 kernels
diff --git a/tools/generate_di_list b/tools/generate_di_list
index 89eb6828..b9fef8cd 100755
--- a/tools/generate_di_list
+++ b/tools/generate_di_list
@@ -13,6 +13,8 @@ print OUT << "EOF";
  * This list can be generated with the command:
  * ../tools/generate_di_list
  *
+ * DO NOT EDIT THIS FILE, edit the above script
+ *
  * Last update: $DATE
  */
 EOF