diff --git a/debian/changelog b/debian/changelog
index cf19665b..dd9ef290 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ debian-cd (2.2.17) UNRELEASED; urgency=low
     Closes: #220125, #219986
     It is already on CD1 of a normal CD set.
   * Kenshi Muto
-    - Add jfbterm, unifont into forcd1 (second stage of debian-installer needs
+    - Add jfbterm, unifont into forcd1, d-i+kernel (second stage of debian-installer needs
       them).
   * Joey Hess
     - Merge in d-i iso/syslinux help files from d-i CVS to data/sarge.
diff --git a/tasks/debian-installer+kernel b/tasks/debian-installer+kernel
index 63f8f27f..ed0f09b2 100644
--- a/tasks/debian-installer+kernel
+++ b/tasks/debian-installer+kernel
@@ -15,6 +15,8 @@ grub
 locales
 lvm10
 aptitude
+jfbterm
+unifont
 #ifdef ARCH_i386
 kernel-image-2.4.22-1-386
 kernel-pcmcia-modules-2.4.22-1-386
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 63d904a4..ada5eda1 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -23,6 +23,8 @@ grub
 locales
 lvm10
 aptitude
+jfbterm
+unifont
 #ifdef ARCH_i386
 EOF