diff --git a/debian/changelog b/debian/changelog
index 5357bf702..d6f2852c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ linux (4.0.4-2) UNRELEASED; urgency=medium
   * [armhf] Add stmmac-platform module to nic-modules udeb. (Closes: #786716)
   * [arm] Fix mvebu-mbus for non-io-coherent platforms. In particular
     armel/{orion5x,kirkwood}.
+  * [armel/kirkwood]: Enable CONFIG_ARM_KIRKWOOD_CPUIDLE. (Closes: #787716)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 27 May 2015 21:36:56 +0100
 
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 2eedff001..3296f4355 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -143,6 +143,11 @@ CONFIG_BT_HCIVHCI=m
 ##
 CONFIG_CPU_IDLE=y
 
+##
+## file: drivers/cpuidle/Kconfig.arm
+##
+CONFIG_ARM_KIRKWOOD_CPUIDLE=y
+
 ##
 ## file: drivers/crypto/Kconfig
 ##