diff --git a/debian/changelog b/debian/changelog
index 6af7f0206..dd279335a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ linux (4.15~rc8-1~exp2) UNRELEASED; urgency=medium
   [ Uwe Kleine-König ]
   * [arm64] enable I2C_PXA for espressobin (Closes: #886983)
 
+  [ Ben Hutchings ]
+  * Enable CGROUP_BPF (except for armel) (Closes: #872560)
+
  -- Bastian Blank <waldi@debian.org>  Thu, 18 Jan 2018 09:14:57 +0100
 
 linux (4.15~rc8-1~exp1) experimental; urgency=medium
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index cc83a61db..c85767564 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -724,6 +724,7 @@ CONFIG_NLS=m
 #. Saves about 7K
 # CONFIG_MEMCG is not set
 # CONFIG_CFS_BANDWIDTH is not set
+# CONFIG_CGROUP_BPF is not set
 ## choice: Compiler optimization level
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 ## end choice
diff --git a/debian/config/config b/debian/config/config
index 5d772baba..3821bc5bb 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5873,6 +5873,7 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y