diff --git a/debian/changelog b/debian/changelog
index 34e060ffe..1d8dee7e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ linux (3.7.2-1~experimental.1) UNRELEASED; urgency=low
     size limit (fixes FTBFS)
   * ALSA: usb-audio: Avoid autopm calls after disconnection; Fix missing
     autopm for MIDI input (Closes: #664068)
+  * [!x86] Disable ZRAM, ZSMALLOC as modules (Reopens: #676779), as they
+    really aren't portable yet.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 06 Jan 2013 04:39:12 +0000
 
diff --git a/debian/config/config b/debian/config/config
index 31211c9dc..c3fe57708 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3054,16 +3054,6 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
 ##
 # CONFIG_PRISM2_USB is not set
 
-##
-## file: drivers/staging/zram/Kconfig
-##
-CONFIG_ZRAM=m
-
-##
-## file: drivers/staging/zsmalloc/Kconfig
-##
-CONFIG_ZSMALLOC=m
-
 ##
 ## file: drivers/target/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index a4c66df59..d8ecf67aa 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1419,6 +1419,16 @@ CONFIG_VT6656=m
 ##
 CONFIG_PRISM2_USB=m
 
+##
+## file: drivers/staging/zram/Kconfig
+##
+CONFIG_ZRAM=m
+
+##
+## file: drivers/staging/zsmalloc/Kconfig
+##
+CONFIG_ZSMALLOC=m
+
 ##
 ## file: drivers/thermal/Kconfig
 ##