diff --git a/debian/changelog b/debian/changelog
index 3db16ac94..bed964e5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
   * x86/iTCO-wdt: Add device ids for Intel 'Ibex Peak' PCH
   * Documentation/3c509: document ethtool support (Closes: #564743)
 
+  [ Ian Campbell ]
+  * xen: Enable up to 32G of guest memory on i386.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 10 Jan 2010 17:38:50 +0000
 
 linux-2.6 (2.6.32-5) unstable; urgency=low
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index b505b5081..eaa129512 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -70,7 +70,7 @@ CONFIG_LGUEST_GUEST=y
 ##
 ## file: arch/x86/xen/Kconfig
 ##
-CONFIG_XEN_MAX_DOMAIN_MEMORY=8
+CONFIG_XEN_MAX_DOMAIN_MEMORY=32
 
 ##
 ## file: crypto/Kconfig