diff --git a/data/lenny/exclude-udebs b/data/lenny/exclude-udebs
index 5077187b..e169d9da 100644
--- a/data/lenny/exclude-udebs
+++ b/data/lenny/exclude-udebs
@@ -45,8 +45,7 @@ cdebconf-gtk-udeb
 fontconfig-udeb
 libatk1.0-udeb
 libcairo-directfb2-udeb
-libdirectfb-0.9-22-udeb
-libdirectfb-0.9-25-udeb
+libdirectfb-*-udeb
 libexpat1-udeb
 libfreetype6-udeb
 libglib2.0-udeb
@@ -122,4 +121,6 @@ discover1-data-udeb
 libdiscover1-udeb
 # Eh?
 gnumach-udeb
-# Exclude apt-setup components; they will be included 
+# Exclude kbd and console-setup udebs, they're not currently used
+kbd-udeb
+console-setup-*-udeb
diff --git a/debian/changelog b/debian/changelog
index 6bec1792..0b638195 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,8 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
     include the first one. This reduces the size of the netinst and improves
     what's included on CD1. Only loss is console-{data,common,tools} so these
     are now added in generate_di+k_list.
+  * exclude-udebs: exclude any libdirectfb udeb instead of particular version.
+  * exclude-udebs: exclude kbd-udeb and console-setup udebs (not yet used).
 
  -- Frans Pop <fjp@debian.org>  Mon, 17 Dec 2007 21:54:11 +0100