diff --git a/debian/changelog b/debian/changelog
index 0360862a..95489561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,7 @@ debian-cd (3.1.4) unstable; urgency=low
     for the patch. Closes: #537368
   * Include the acpi package for all x86 media types. Closes: #475243
   * Include the wpasupplicant package on netinsts and larger. Closes: #593914
+  * Include kbd on first CD rather than console-tools. Closes: #514654
 
   [ Ian Campbell ]
   * boot-x86: detect duplicates in the extra images used for installation
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 01704af5..6439b588 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -45,13 +45,8 @@ aptitude
 hotplug
 pciutils
 usbutils
-/* Used for Lenny and earlier */
-console-data
-console-common
-console-tools
-console-cyrillic
-console-terminus
 /* Used for Squeeze and onwards */
+kbd
 console-setup
 pcmciautils
 wireless-tools