diff --git a/debian/changelog b/debian/changelog
index 5b7acbf04..131a36b8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ linux (3.13~rc4-1~exp1) UNRELEASED; urgency=low
     TCG_TIS_I2C_NUVOTON, TCG_ST33_I2C, TCG_XEN as modules
   * [amd64] misc: Enable INTEL_MIC_HOST as module
   * [powerpc/powerpc64] block: Enable AIX_PARTITION
+  * net/sched: Change NET_CLS_CGROUP from built-in to module
 
   [ Aurelien Jarno ]
   * [mipsel] Remove r5k-cobalt flavour.
diff --git a/debian/config/config b/debian/config/config
index 40d9a6d3a..628a9ce8b 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5411,7 +5411,7 @@ CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32