diff --git a/config-powerpc64 b/config-powerpc64
index f54bcdc..f94a975 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -154,6 +154,10 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 
 CONFIG_PSERIES_ENERGY=m
 
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_GOV_LADDER is not set
+CONFIG_PSERIES_IDLE=y
+
 CONFIG_PPC_ICSWX=y
 CONFIG_IO_EVENT_IRQ=y
 CONFIG_HW_RANDOM_AMD=m
diff --git a/kernel.spec b/kernel.spec
index 25ec057..a6926ee 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2423,6 +2423,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Thu May 17 2012 Josh Boyer <jwboyer@redhat.com>
+- Enable cpu_idle drivers for ppc64/pseries (requested by Ben Herrenschmidt)
+
 * Wed May 16 2012 Dennis Gilmore <dennis@ausil.us>
 - set arch for arm kernel to VEXPRESS allows v7 emulation
 - enable SMP everywhere but disable on kirkwood as its up only