diff --git a/debian/changelog b/debian/changelog
index 3d7988b3d..de185bfcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ linux (3.6.7-1~experimental.1) UNRELEASED; urgency=low
   * [x86] Enable more platform drivers.
   * [s390/s390x-tape, s390x/s390x-tape] Remove not longer supported image
     variant.
+  * [s390, s390x] Enable support for transparent hugepages.
 
  -- Bastian Blank <waldi@debian.org>  Wed, 21 Nov 2012 09:34:28 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 0d130f566..abe40ff44 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4035,6 +4035,10 @@ CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+## choice: Transparent Hugepage Support sysfs defaults
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+## end choice
 
 ##
 ## file: net/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 73af01904..ad011ff5d 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1606,10 +1606,6 @@ CONFIG_SPARSE_IRQ=y
 ## file: mm/Kconfig
 ##
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_TRANSPARENT_HUGEPAGE=y
-## choice: Transparent Hugepage Support sysfs defaults
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
-## end choice
 
 ##
 ## file: mm/Kconfig.debug