diff --git a/debian/changelog b/debian/changelog
index 3c3d994cf..0a0d820ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,7 @@ linux-2.6 (2.6.29~rc8-1~experimental.1) UNRELEASED; urgency=low
   * [s390/s390] Disable BTRFS.
   * [sparc] Use sparc as kernel architecture.
   * Update kconfig report changes patch.
+  * [s390] Enable KVM.
 
   [ Martin Michlmayr ]
   * [mips/r4k-ip22] Build in RTC_DRV_DS1286.
diff --git a/debian/config/s390/config b/debian/config/s390/config
index f7aa9ffbf..43250fd8c 100644
--- a/debian/config/s390/config
+++ b/debian/config/s390/config
@@ -30,6 +30,13 @@ CONFIG_APPLDATA_NET_SUM=m
 CONFIG_S390_HYPFS_FS=y
 CONFIG_KEXEC=y
 # CONFIG_ZFCPDUMP is not set
+CONFIG_S390_GUEST=y
+
+##
+## file: arch/s390/kvm/Kconfig
+##
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
 
 ##
 ## file: drivers/block/Kconfig