diff --git a/debian/changelog b/debian/changelog
index 8192e261b..1ce968962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 linux (3.16.5-2) UNRELEASED; urgency=medium
 
+  [ Ben Hutchings ]
   * qla2xxx: fix kernel NULL pointer access (regression in 3.16)
     (Closes: #764804)
 
+  [ Mauricio Faria de Oliveira ]
+  * [ppc64el] Disable CONFIG_CMDLINE{,_BOOL} usage for setting consoles
+    (Closes: #764745)
+
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 11 Oct 2014 21:41:58 +0100
 
 linux (3.16.5-1) unstable; urgency=medium
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index 58fb65ffd..2d524df40 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -9,7 +9,6 @@ CONFIG_NUMA=y
 CONFIG_PPC_64K_PAGES=y
 ## end choice
 CONFIG_SCHED_SMT=y
-CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"
 CONFIG_KERNEL_START=0xc000000000000000
 
 ##
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be
index b662db0d5..7210101f1 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-be
+++ b/debian/config/kernelarch-powerpc/config-arch-64-be
@@ -1,3 +1,8 @@
+##
+## file: arch/powerpc/Kconfig
+##
+CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"
+
 ##
 ## file: arch/powerpc/platforms/cell/Kconfig
 ##
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-le b/debian/config/kernelarch-powerpc/config-arch-64-le
index dbe0a4183..be64aa451 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-le
+++ b/debian/config/kernelarch-powerpc/config-arch-64-le
@@ -1,3 +1,8 @@
+##
+## file: arch/powerpc/Kconfig
+##
+# CONFIG_CMDLINE_BOOL is not set
+
 ##
 ## file: arch/powerpc/platforms/Kconfig.cputype
 ##