diff --git a/debian/changelog b/debian/changelog
index e7fa18ea..32a6026c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+debian-cd (3.1.10) UNRELEASED; urgency=low
+
+  * Clean up forcd1, removing twm, wmaker, wmakerconf, pump,
+    menu (pulled in by desktop tasks),
+    aptitude (pulled in by debootstap, and may be demoted to optional),
+    alsa-utils, alsa-base (pulled in by task-desktop),
+    mdetect, read-edid (no longer used by xorg),
+    grub (handed by generate_di+k_list),
+    deborphan, debfoster, localepurge (expert user stuff),
+    chdrvfont (no such package any more)
+  * Updated generate_di+k_list to match more closely the current
+    packages d-i apt-installs.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 07 Jul 2012 15:44:03 -0600
+
 debian-cd (3.1.9) unstable; urgency=low
 
   [ Steve McIntyre ]
diff --git a/tasks/squeeze/forcd1 b/tasks/squeeze/forcd1
index 9a619442..b0e782cc 100644
--- a/tasks/squeeze/forcd1
+++ b/tasks/squeeze/forcd1
@@ -7,8 +7,6 @@ module-assistant
 deborphan
 debfoster
 debsums
-localepurge
-chdrvfont
 fbset
 fdutils
 ftp
@@ -32,7 +30,6 @@ read-edid
 mdetect
 aptitude
 brltty
-popularity-contest
 ntpdate
 hdparm
 jfbterm
diff --git a/tasks/wheezy/forcd1 b/tasks/wheezy/forcd1
index 3fd074c2..aff730f6 100644
--- a/tasks/wheezy/forcd1
+++ b/tasks/wheezy/forcd1
@@ -4,33 +4,21 @@ gnupg
 build-essential
 kernel-package
 module-assistant
-deborphan
-debfoster
 debsums
 localepurge
 chdrvfont
 fbset
 fdutils
-ftp
 g++
 libnet-telnet-perl
 libtimedate-perl
 libmailtools-perl
-pump
-twm
-menu
-wmaker
-wmakerconf
 libterm-readline-gnu-perl
 whiptail
 dialog
 doc-base
-grub
 util-linux-locales
 discover
-read-edid
-mdetect
-aptitude
 brltty
 espeakup
 popularity-contest
@@ -41,7 +29,5 @@ unifont
 console-cyrillic
 console-terminus
 iso-codes
-alsa-base
-alsa-utils
 wpasupplicant
 apt-offline
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 572fc754..611d2105 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -37,31 +37,26 @@ cat > debian-installer+kernel << EOF
 #include <debian-installer>
 eject
 locales
-libdevmapper1.02
-lvm-common
 lvm2
 mdadm
-aptitude
-hotplug
 pciutils
 usbutils
-/* Used for Squeeze and onwards */
-kbd
+keyboard-configuration
 console-setup
 pcmciautils
 wireless-tools
 xfsprogs
 jfsutils
-dosfsutils
+dosfstools
 reiserfsprogs
 btrfs-tools
 ufsutils
 zfsutils
 libfribidi0
-localization-config
 acpi
 acpid
 acpi-support-base
+pbbuttonsd
 ppp
 pppoeconf
 pptp-linux
@@ -71,6 +66,13 @@ openssh-server
 cryptsetup
 loop-aes-utils
 dmraid
+discover
+mouseemu
+popularity-contest
+os-prober
+open-iscsi
+e2fsprogs
+mouseemu
 
 /* Needed for rootless installs. */
 sudo
@@ -103,6 +105,7 @@ initramfs-tools
 busybox
 grub-legacy
 grub-pc
+dmsetup
 laptop-detect
 lilo
 elilo
@@ -126,6 +129,7 @@ initramfs-tools
 busybox
 grub-legacy
 grub-pc
+dmsetup
 laptop-detect
 lilo
 linux-image-amd64
@@ -214,6 +218,10 @@ linux-image-powerpc64
 linux-image-prep
 #endif
 
+#ifdef ARCH_alpha
+aboot
+#endif
+
 #ifdef ARCH_kfreebsd_amd64
 kfreebsd-image-8-amd64
 kfreebsd-image-9-amd64