diff --git a/config-x86_64-generic b/config-x86_64-generic
index dfd56a5b4..02883b84b 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -37,6 +37,7 @@ CONFIG_SWIOTLB=y
 # CONFIG_GART_IOMMU is not set
 
 CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_MEM_SOFT_DIRTY=y
 
diff --git a/kernel.spec b/kernel.spec
index f6c8d8969..458ec0baf 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2068,6 +2068,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Mar 27 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Switch to CONFIG_TRANSPARENT_HUGEPAGE_MADVISE instead of always on
+
 * Tue Mar 25 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc8.git0.1
 - Linux v3.14-rc8
 - Disable debugging options.