diff --git a/config-x86-generic b/config-x86-generic
index d6feae847..f45da91dd 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -534,7 +534,7 @@ CONFIG_JUMP_LABEL=y
 
 CONFIG_X86_32_IRIS=m
 
-CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
 
 CONFIG_CRYPTO_AES_NI_INTEL=m
 
diff --git a/kernel.spec b/kernel.spec
index e5572b90f..7a5192cdb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -1955,6 +1955,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Jan 25 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc2.git3.2
+- [x86] Disable TRANSPARENT_HUGEPAGE for now, there be dragons there.
+
 * Tue Jan 25 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc2.git3.1
 - Linux 2.6.38-rc2-git3
 - perf-gcc460-build-fixes.patch: fix context from [9486aa38]