diff --git a/debian/changelog b/debian/changelog
index 96c1efe44..342fb3733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,7 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
   [ maximilian attems ]
   * [topconfig] set MEMORY_FAILURE, 9P_FSCACHE, INFINIBAND_IPOIB_CM
     (closes: #565494)
+  * Enable easier debugging of Power Managment code. (closes: #478315)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 10 Jan 2010 17:38:50 +0000
 
diff --git a/debian/config/config b/debian/config/config
index d957c0d8f..2522a8466 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3212,7 +3212,9 @@ CONFIG_HZ_250=y
 ## file: kernel/power/Kconfig
 ##
 CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_VERBOSE is not set 
+CONFIG_PM_TRACE=y 
 CONFIG_SUSPEND=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 6f382fe09..33be3537f 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1296,6 +1296,12 @@ CONFIG_EFI_PARTITION=y
 ##
 # CONFIG_MMIOTRACE is not set
 
+##
+## file: drivers/power/Kconfig
+##
+CONFIG_PM_TRACE_RTC=y
+CONFIG_PM_TEST_SUSPEND=y
+
 ##
 ## file: lib/Kconfig.debug
 ##