diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config
index f6a47bef4..19a201ec6 100644
--- a/debian/arch/amd64/config
+++ b/debian/arch/amd64/config
@@ -1236,7 +1236,7 @@ CONFIG_FB_S1D13XXX=m
 CONFIG_FB_VIRTUAL=m
 CONFIG_VGA_CONSOLE=y
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
diff --git a/debian/arch/i386/config b/debian/arch/i386/config
index 4808d3412..262103a80 100644
--- a/debian/arch/i386/config
+++ b/debian/arch/i386/config
@@ -1448,7 +1448,7 @@ CONFIG_FB_VIRTUAL=m
 CONFIG_VGA_CONSOLE=y
 CONFIG_MDA_CONSOLE=m
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
diff --git a/debian/changelog b/debian/changelog
index 12ee4da4a..114fd11c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,14 @@ linux-2.6 (2.6.14-3) UNRELEASED; urgency=low
   * Fix the install-image script to correctly include all the necessary
     stuff in scripts. (Closes: #336424)
 
- -- maximilian attems <maks@sternwelten.at>  Thu,  3 Nov 2005 12:37:31 +0100
+  [ Simon Horman ]
+  * [386, AMD64] Set CONFIG_FRAMEBUFFER_CONSOLE=y instead of m.
+    As vesadb now built into the kernel, after finally dropping the
+    debian-specific patch to make it modular, make fbcons builtin too, else
+    all sorts of weird stuff happens which is hard for the inird builders to
+    automatically compenste for. (Closes: #336450)
+
+ -- Simon Horman <horms@debian.org>  Fri,  4 Nov 2005 13:03:49 +0900
 
 linux-2.6 (2.6.14-2) unstable; urgency=low