diff --git a/debian/changelog b/debian/changelog
index 1d5780aa1..5b09b3c8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ linux-2.6 (3.0~rc1-1~experimental.1) UNRELEASED; urgency=low
   * mmc: Enable MMC_VUB300, MMC_USHC as modules
   * memstick: Enable MEMSTICK_R592 as module
   * [x86] edac: Enable EDAC_I7300 as module
+  * [i386] staging, video: Enable FB_OLPC_DCON as module
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 21 May 2011 22:13:08 +0100
 
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index cba91eb4b..ca685cb46 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -350,6 +350,13 @@ CONFIG_PCMCIA_NINJA_SCSI=m
 ##
 CONFIG_CS5535_GPIO=m
 
+##
+## file: drivers/staging/olpc_dcon/Kconfig
+##
+CONFIG_FB_OLPC_DCON=m
+CONFIG_FB_OLPC_DCON_1=y
+CONFIG_FB_OLPC_DCON_1_5=y
+
 ##
 ## file: drivers/staging/tty/Kconfig
 ##