diff --git a/debian/changelog b/debian/changelog
index 33276c76a..b0c2180bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ linux-2.6 (3.0~rc1-1~experimental.1) UNRELEASED; urgency=low
     Linksys WUSB600N (Closes: #596626) (this change was accidentally
     omitted from 2.6.39-1)
   * fs: Enable FHANDLE
+  * cgroups: Enable CGROUP_MEM_RES_CTLR_SWAP but not
+    CGROUP_MEM_RES_CTLR_SWAP_ENABLED. Swap accounting can be enabled
+    using kernel parameter 'swapaccount'.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 21 May 2011 22:13:08 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 21649aa00..efca457a2 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3407,6 +3407,8 @@ CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_DISABLED=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_RT_GROUP_SCHED is not set