diff --git a/config-generic b/config-generic
index ea9b535c4..930edfd47 100644
--- a/config-generic
+++ b/config-generic
@@ -4013,7 +4013,6 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # XXX disabled by default, pass 'swapaccount'
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
 CONFIG_CGROUP_PERF=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
diff --git a/kernel.spec b/kernel.spec
index c8b2898b4..3f9feeb06 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2021,6 +2021,7 @@ fi
 - Make some config changes caught during a review:
  - CONFIG_SOC_CAMERA: disable, it's only for some ARM boards
  - CONFIG_MEDIA_ALTERA_CI=m: needed for some DVB boards
+ - CONFIG_DEBUG_BLK_CGROUP: stop setting it twice...
 
 * Wed Oct 26 2011 Chuck Ebbert <cebbert@redhat.com>
 - Add build option "--with=release" to build a non-debug kernel in rawhide.