diff --git a/debian/changelog b/debian/changelog
index 2e9405c2d..6577afb12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ linux (4.3.1-1~exp1) UNRELEASED; urgency=medium
     (Closes: #807721)
   * [x86] drm/i915: Mark uneven memory banks on gen4 desktop as unknown
     swizzling (Closes: #780363)
+  * Enable CC_STACKPROTECTOR_STRONG (Closes: #805652)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 09 Dec 2015 23:20:32 +0000
 
diff --git a/debian/config/armel/config-reduced b/debian/config/armel/config-reduced
index 2606fd14f..7392e0dc9 100644
--- a/debian/config/armel/config-reduced
+++ b/debian/config/armel/config-reduced
@@ -2,6 +2,10 @@
 ## file: arch/Kconfig
 ##
 # CONFIG_KPROBES is not set
+## choice: Stack Protector buffer overflow detection
+CONFIG_CC_STACKPROTECTOR_REGULAR=y
+# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+## end choice
 
 ##
 ## file: block/Kconfig.iosched
diff --git a/debian/config/config b/debian/config/config
index 5dbc43a6e..aef085974 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5,7 +5,7 @@ CONFIG_OPROFILE=m
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 ## choice: Stack Protector buffer overflow detection
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
+CONFIG_CC_STACKPROTECTOR_STRONG=y
 ## end choice
 
 ##