diff --git a/debian/changelog b/debian/changelog
index 29eb56812..065ce37c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,7 @@ linux (3.7.1-1~experimental.1) UNRELEASED; urgency=low
   * rt2800pci: Enable RT2800PCI_RT3290
   * wireless/ti: Enable WL18XX as module
   * ptp: Enable clock drivers along with associated net/PHY drivers
+  * [!x86] drm: Disable DRM_VMWGFX
 
  -- maximilian attems <maks@debian.org>  Thu, 06 Dec 2012 18:14:33 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 0dfe98c12..215852350 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -413,7 +413,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 ##
 ## file: drivers/gpu/drm/vmwgfx/Kconfig
 ##
-CONFIG_DRM_VMWGFX=m
+# CONFIG_DRM_VMWGFX is not set
 
 ##
 ## file: drivers/hid/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 5ad4254cf..a1e05d66a 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -457,6 +457,11 @@ CONFIG_DRM_I2C_SIL164=m
 ##
 CONFIG_DRM_RADEON_KMS=y
 
+##
+## file: drivers/gpu/drm/vmwgfx/Kconfig
+##
+CONFIG_DRM_VMWGFX=m
+
 ##
 ## file: drivers/gpu/stub/Kconfig
 ##