diff --git a/Config.in b/Config.in
index d1a6e0b9ae..c023d60793 100644
--- a/Config.in
+++ b/Config.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -278,6 +278,153 @@ menu "Global build settings"
 		bool "Enable printk timestamps"
 		default y
 
+	#
+	# CGROUP support symbols
+	#
+
+	config KERNEL_FREEZER
+		bool
+		default y if KERNEL_CGROUP_FREEZER
+		depends KERNEL_CGROUPS
+
+	config KERNEL_CGROUP_FREEZER
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_CGROUP_DEVICE
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_CPUSETS
+		bool
+		default y if KERNEL_CGROUP_CPUACCT
+		depends KERNEL_CGROUPS
+
+	config KERNEL_PROC_PID_CPUSET
+		bool
+		default y if KERNEL_CGROUP_CPUACCT
+		depends KERNEL_CGROUPS
+
+	config KERNEL_CGROUP_CPUACCT
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_RESOURCE_COUNTERS
+		bool
+		default y if KERNEL_CGROUP_MEM_RES_CTLR
+		depends KERNEL_CGROUPS
+
+	config KERNEL_CGROUP_MEM_RES_CTLR
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_CGROUP_MEM_RES_CTLR_SWAP
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_CGROUP_MEM_RES_CTLR_SWAP_ENABLED
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_CGROUP_MEM_RES_CTLR_KMEM
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_CGROUP_PERF
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_CFS_BANDWIDTH
+		bool
+		default y if KERNEL_FAIR_GROUP_SCHED
+		depends KERNEL_CGROUP_SCHED
+
+	config KERNEL_FAIR_GROUP_SCHED
+		bool
+		default y if KERNEL_CGROUP_SCHED
+		depends KERNEL_CGROUP_SCHED
+
+	config KERNEL_RT_GROUP_SCHED
+		bool
+		default y if KERNEL_CGROUP_SCHED
+		depends KERNEL_CGROUP_SCHED
+
+	config KERNEL_CGROUP_SCHED
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_NET_CLS_CGROUP
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_NETPRIO_CGROUP
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_BLK_CGROUP
+		bool
+		depends KERNEL_CGROUPS
+
+	config KERNEL_DEBUG_BLK_CGROUP
+		bool
+		default n if KERNEL_CGROUPS
+		depends KERNEL_CGROUPS
+
+	config KERNEL_CGROUPS
+		bool "Enable kernel cgroups"
+		default n
+		select KERNEL_CGROUP_FREEZER
+		select KERNEL_CGROUP_DEVICE
+		select KERNEL_CGROUP_CPUACCT
+		select KERNEL_CGROUP_MEM_RES_CTLR
+		select KERNEL_CGROUP_MEM_RES_CTLR_SWAP
+		select KERNEL_CGROUP_MEM_RES_CTLR_SWAP_ENABLED
+		select KERNEL_CGROUP_MEM_RES_CTLR_KMEM
+		select KERNEL_CGROUP_PERF
+		select KERNEL_CGROUP_SCHED
+		select KERNEL_NET_CLS_CGROUP
+		select KERNEL_NETPRIO_CGROUP
+		select KERNEL_BLK_CGROUP
+
+	#
+	# Namespace support symbols
+	#
+
+	config KERNEL_UTS_NS
+		bool
+		depends KERNEL_NAMESPACES
+
+	config KERNEL_IPC_NS
+		bool
+		depends KERNEL_NAMESPACES
+
+	config KERNEL_USER_NS
+		bool
+		depends KERNEL_NAMESPACES
+
+	config KERNEL_PID_NS
+		bool
+		depends KERNEL_NAMESPACES
+
+	config KERNEL_NET_NS
+		bool
+		depends KERNEL_NAMESPACES
+
+	config KERNEL_DEVPTS_MULTIPLE_INSTANCES
+		bool
+		depends KERNEL_NAMESPACES
+
+	config KERNEL_NAMESPACES
+		bool "Enable kernel namespaces"
+		default n
+		select KERNEL_UTS_NS
+		select KERNEL_IPC_NS
+		select KERNEL_USER_NS
+		select KERNEL_PID_NS
+		select KERNEL_NET_NS
+		select KERNEL_DEVPTS_MULTIPLE_INSTANCES
+
+
 	comment "Package build options"
 
 	config DEBUG