diff --git a/config-generic b/config-generic
index 50918d378..7d162aa65 100644
--- a/config-generic
+++ b/config-generic
@@ -4196,8 +4196,8 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y # XXX disabled by default, pass 'swapaccount'
-# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 # CONFIG_CGROUP_HUGETLB is not set
 CONFIG_CGROUP_PERF=y
diff --git a/kernel.spec b/kernel.spec
index 0ac98f6f0..27f84658b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2226,6 +2226,7 @@ fi
 #                 ||     ||
 %changelog
 * Thu May 16 2013 Josh Boyer <jwboyer@redhat.com>
+- Enable memory cgroup swap accounting (rhbz 918951)
 - Fix config-local usage (rhbz 950841)
 
 * Wed May 15 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git5.1