diff --git a/debian/changelog b/debian/changelog
index 9a45e4434..b5275356a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,8 @@ linux-2.6 (2.6.35~rc4-1~experimental.1) UNRELEASED; urgency=low
   * [armel/kirkwood] Enable FB_XGI and FRAMEBUFFER_CONSOLE.
   * [armel] Make MOUSE_PS2 modular.
   * [armel] Build INPUT_UINPUT for all flavours.
+  * [armel/kirkwood] Enable FB_UDL.
+  * [armel] Disable PARPORT_PC (Closes: #588164)
 
   [ Bastian Blank ]
   * Disable mISDN support for NETJet cards. The driver binds a generic PCI
diff --git a/debian/config/armel/config b/debian/config/armel/config
index 625927719..1d4e1fa08 100644
--- a/debian/config/armel/config
+++ b/debian/config/armel/config
@@ -100,3 +100,4 @@ CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
 
+# CONFIG_PARPORT_PC is not set
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 43235542b..4a87f8454 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -633,3 +633,8 @@ CONFIG_X25=m
 ##
 CONFIG_FB_XGI=m
 
+##
+## file: drivers/staging/udlfb/Kconfig
+##
+CONFIG_FB_UDL=m
+