diff --git a/config-x86-generic b/config-x86-generic
index 64690645e..f1686da59 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -489,6 +489,6 @@ CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_LPC_SCH=m
 
-CONFIG_INTEL_IDLE=m
+CONFIG_INTEL_IDLE=y
 
 CONFIG_PCI_CNB20LE_QUIRK=y
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 5fb5f1b53..650aed31c 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -403,7 +403,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_LPC_SCH=m
 
-CONFIG_INTEL_IDLE=m
+CONFIG_INTEL_IDLE=y
 CONFIG_I7300_IDLE=m
 
 CONFIG_PCI_CNB20LE_QUIRK=y
diff --git a/kernel.spec b/kernel.spec
index 2f8b50226..a867f7eb5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1975,6 +1975,11 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 04 2010 Kyle McMartin <kyle@redhat.com>
+- Build intel_idle into the kernel, so they get loaded by default. In
+  later kernels, it is no longer modular, so it isn't an issue. Noticed
+  by mjg59.
+
 * Mon Oct 04 2010 Kyle McMartin <kyle@redhat.com>
 - Make printk.time=1 the default, use printk.time=0 to turn it off.
   Results in much more useful traces for us, which is a big win.