diff --git a/debian/changelog b/debian/changelog
index c20b7f07a..15fd0c300 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -147,6 +147,9 @@ linux (4.0.4-1) UNRELEASED; urgency=medium
     (Closes: #786372) (regression in 4.0.2)
   * [x86] e1000e: Add support for Sunrise Point (i219) (Closes: #784546)
 
+  [ Ian Campbell ]
+  * [armhf+arm64] Enabled generic SYSCON regmap reset driver
+
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 18 May 2015 00:00:06 +0100
 
 linux (4.0.2-1) unstable; urgency=medium
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 81ed34c45..1f0798b89 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -87,6 +87,7 @@ CONFIG_PHY_XGENE=m
 ##
 ## file: drivers/power/reset/Kconfig
 ##
+CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_XGENE=y
 
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 273c8ace0..795ed010e 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -671,6 +671,7 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_SYSCON=y
 
 ##
 ## file: drivers/pwm/Kconfig