diff --git a/data/etch/exclude-udebs b/data/etch/exclude-udebs
index 47c32685..39960de2 100644
--- a/data/etch/exclude-udebs
+++ b/data/etch/exclude-udebs
@@ -62,6 +62,7 @@ libgtk+2.0-directfb0-udeb
 libpango1.0-udeb
 libpng12-0-udeb
 ttf-freefont-udeb
+ttf-cjk-compact-udeb
 libdirectfb-0.9-22-udeb
 fbset-udeb
 # This udeb is not in good shape and is largely supersceded by
diff --git a/debian/changelog b/debian/changelog
index a6bfcc9a..751a0e87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -138,8 +138,10 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
   * Remove iso-codes from netinst, not used.
   * Drop floppies from i386 netinst and businesscard; this will make the
     netinst small enough to fit on 128 mb usb keychains again.
+  * Deal with 386 -> 486 name change in kernel images.
+  * Exclude ttf-cjk-compact-udeb.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 28 Dec 2005 13:07:04 -0500
+ -- Joey Hess <joeyh@debian.org>  Sat,  7 Jan 2006 16:56:49 -0500
 
 debian-cd (2.2.23) unstable; urgency=low
 
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 46ac99e1..edaec0ce 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -65,6 +65,9 @@ kernel-pcmcia-modules-2.4-386
 kernel-headers-2.4-386
 linux-image-2.6-386
 linux-headers-2.6-386
+/* 486 are same images, new name */
+linux-image-2.6-486
+linux-headers-2.6-486
 #endif
 
 #ifdef ARCH_amd64