diff --git a/debian/changelog b/debian/changelog
index 91ba291cd..9622d02ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,8 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
 
   [ Bastian Blank ]
   * Enable all NCP file system options.
+  * [amd64] Make AGP support again built-in to fullfill the not completely
+    documented dependency with GART IOMMU support. (closes: #561552)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 10 Jan 2010 17:38:50 +0000
 
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index 12c5392c7..d3541bc32 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -60,6 +60,13 @@ CONFIG_SPECIALIX=m
 CONFIG_RIO=m
 CONFIG_RIO_OLDPCI=y
 
+##
+## file: drivers/char/agp/Kconfig
+##
+CONFIG_AGP=y
+#. Needed by GART_IOMMU
+CONFIG_AGP_AMD64=y
+
 ##
 ## file: drivers/i2c/busses/Kconfig
 ##