diff --git a/debian/changelog b/debian/changelog
index de185bfcb..8915a43dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ linux (3.6.7-1~experimental.1) UNRELEASED; urgency=low
   * [s390/s390x-tape, s390x/s390x-tape] Remove not longer supported image
     variant.
   * [s390, s390x] Enable support for transparent hugepages.
+  * Use XZ for kernel images if supported.
 
  -- Bastian Blank <waldi@debian.org>  Wed, 21 Nov 2012 09:34:28 +0100
 
diff --git a/debian/config/armel/config b/debian/config/armel/config
index 9468f7768..7f832b928 100644
--- a/debian/config/armel/config
+++ b/debian/config/armel/config
@@ -111,15 +111,6 @@ CONFIG_YAM=m
 # CONFIG_VIRTIO_PCI is not set
 # CONFIG_VIRTIO_BALLOON is not set
 
-##
-## file: init/Kconfig
-##
-## choice: Kernel compression mode
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-## end choice
-
 ##
 ## file: security/apparmor/Kconfig
 ##
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 07dc8d619..a639ae4cc 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -23,12 +23,3 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_BAYCOM_EPP is not set
 # CONFIG_YAM is not set
 
-##
-## file: init/Kconfig
-##
-## choice: Kernel compression mode
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-## end choice
-
diff --git a/debian/config/config b/debian/config/config
index abe40ff44..8c5262e67 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3786,10 +3786,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 ## choice: Kernel compression mode
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_LZO is not set
+CONFIG_KERNEL_XZ=y
 ## end choice
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y