diff --git a/debian/changelog b/debian/changelog
index b3c25e241..99e678d28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux (3.16~rc6-1~exp2) UNRELEASED; urgency=medium
   * [x86] Enable Xen PVH support.
   * Enable more Nftables modules.
   * [x86] Enable EARLY_PRINTK_EFI.
+  * Enable stack protector on all supported architectures. (closes: #756898)
 
  -- Aurelien Jarno <aurel32@debian.org>  Thu, 31 Jul 2014 20:56:06 +0200
 
diff --git a/debian/config/config b/debian/config/config
index 396b32a1e..c11a1445b 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3,6 +3,9 @@
 ##
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
+## choice: Stack Protector buffer overflow detection
+CONFIG_CC_STACKPROTECTOR_REGULAR=y
+## end choice
 
 ##
 ## file: block/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index c571f9e81..44098f996 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -3,9 +3,6 @@
 ##
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-## choice: Stack Protector buffer overflow detection
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
-## end choice
 
 ##
 ## file: arch/x86/Kconfig