diff --git a/debian/changelog b/debian/changelog
index b2505b90e..815c3cdba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ linux-2.6 (2.6.32-1) UNRELEASED; urgency=low
   * usbnet: Set link down initially for drivers that update link state
     (Closes: #444043)
   * aufs2: Update to snapshot from 2009-11-29
+  * i915: Enable auto-loading even though CONFIG_DRM_I915_KMS is not set
 
   [ dann frazier ]
   * mac80211 (CVE-2009-4026, CVE-2009-4027):
diff --git a/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch b/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
new file mode 100644
index 000000000..2f70914eb
--- /dev/null
+++ b/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
@@ -0,0 +1,14 @@
+diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
+index 7f436ec..0c27723 100644
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
+@@ -52,9 +52,7 @@ static struct pci_device_id pciidlist[] = {
+ 	i915_PCI_IDS
+ };
+ 
+-#if defined(CONFIG_DRM_I915_KMS)
+ MODULE_DEVICE_TABLE(pci, pciidlist);
+-#endif
+ 
+ static int i915_suspend(struct drm_device *dev, pm_message_t state)
+ {
diff --git a/debian/patches/series/base b/debian/patches/series/base
index f07a61f26..0c4689b24 100644
--- a/debian/patches/series/base
+++ b/debian/patches/series/base
@@ -80,3 +80,4 @@
 + bugfix/all/atl1e-remove-broken-tsov6.patch
 + features/all/atl1e-allow-offload-disable.patch
 + bugfix/all/usbnet-link-down-initially-for-drivers-that-update.patch
++ features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch