diff --git a/debian/changelog b/debian/changelog
index 4742026cc..1063a7847 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 linux (3.6.4-1~experimental.2) UNRELEASED; urgency=low
 
+  [ Uwe Kleine-König ]
   * [rt] bump to 3.6.4-rt10
 
+  [ Ben Hutchings ]
+  * [x86] staging: Re-enable ZSMALLOC as module, previously selected by
+    ZRAM but now a dependency (Closes: #692024)
+
  -- Uwe Kleine-König <uwe@kleine-koenig.org>  Mon, 29 Oct 2012 15:50:12 +0100
 
 linux (3.6.4-1~experimental.1) experimental; urgency=low
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index d4e5dd5b7..47932b1a1 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1380,6 +1380,11 @@ CONFIG_VT6656=m
 ##
 CONFIG_PRISM2_USB=m
 
+##
+## file: drivers/staging/zsmalloc/Kconfig
+##
+CONFIG_ZSMALLOC=m
+
 ##
 ## file: drivers/staging/zram/Kconfig
 ##