diff --git a/debian/changelog b/debian/changelog
index fb20f4e3c..9f4abc811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ linux (3.16~rc5-1~exp2) experimental; urgency=medium
 
   [ Ben Hutchings ]
   * [x86] wireless: Enable R8192EE as module (Closes: #755310)
+  * net: Re-enable CGROUP_NET_PRIO as builtin
 
  -- Aurelien Jarno <aurel32@debian.org>  Wed, 16 Jul 2014 18:07:48 +0200
 
diff --git a/debian/config/config b/debian/config/config
index 2dc501176..7a00727de 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5063,7 +5063,7 @@ CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_BRIDGE_NETFILTER=y
-CONFIG_CGROUP_NET_PRIO=m
+CONFIG_CGROUP_NET_PRIO=y
 CONFIG_BPF_JIT=y
 CONFIG_NET_PKTGEN=m
 # CONFIG_NET_TCPPROBE is not set