diff --git a/debian/changelog b/debian/changelog
index 100890ab3..ab53f5ba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ linux-2.6 (2.6.38-2) UNRELEASED; urgency=low
   * Add configuration for Debian architecture ppc64, matching the
     powerpc/powerpc64 flavour (Closes: #618976)
   * Enable BOOT_PRINTK_DELAY (support for the boot_delay kernel parameter)
+  * [x86/!486] Enable TRANSPARENT_HUGEPAGE, TRANSPARENT_HUGEPAGE_MADVISE
+    (Closes: #618924)
 
   [ Jurij Smakov ]
   * Bump CONFIG_NR_CPUS on sparc to 256 to accomodate T2+ machines
diff --git a/debian/config/i386/none/config.486 b/debian/config/i386/none/config.486
index 5c2f480da..0259740f0 100644
--- a/debian/config/i386/none/config.486
+++ b/debian/config/i386/none/config.486
@@ -111,3 +111,7 @@ CONFIG_SCSI_SIM710=m
 ##
 CONFIG_FB_GEODE_LX=y
 
+##
+## file: mm/Kconfig
+##
+CONFIG_TRANSPARENT_HUGEPAGE=n
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 0fb54ac94..87595433d 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1372,6 +1372,8 @@ CONFIG_SPARSE_IRQ=y
 ## file: mm/Kconfig
 ##
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 
 ##
 ## file: mm/Kconfig.debug