diff --git a/debian/changelog b/debian/changelog
index 2ae3b5614..f016d8654 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 linux-2.6 (2.6.31-2) UNRELEASED; urgency=low
 
   [ Martin Michlmayr ]
+  * [armel/orion5x, armel/kirkwood] Make sure VGA_CONSOLE is disabled,
+    otherwise the kernel won't boot.
   * [armel/kirkwood] Enable CRYPTO_DEV_MV_CESA (Closes: #552270).
   * [armel/kirkwood, armel/orion5x] Enable ORION_WATCHDOG (the
     name of the config variable changed).
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 6e73f6753..ebf6576b1 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -531,6 +531,11 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
 ##
 CONFIG_FB=m
 
+##
+## file: drivers/video/console/Kconfig
+##
+# CONFIG_VGA_CONSOLE is not set
+
 ##
 ## file: drivers/watchdog/Kconfig
 ##
diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x
index 402a3e7f0..4dc6ebde5 100644
--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@@ -511,6 +511,11 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
 ##
 CONFIG_FB=m
 
+##
+## file: drivers/video/console/Kconfig
+##
+# CONFIG_VGA_CONSOLE is not set
+
 ##
 ## file: drivers/watchdog/Kconfig
 ##