diff --git a/debian/changelog b/debian/changelog
index aae64afdc..3970e3f08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -107,6 +107,8 @@ linux-2.6 (2.6.26~rc8-1~experimental.1) UNRELEASED; urgency=low
   * [s390] Synchronize block device, network bridge, network scheduler and CRC
     support.
   * [s390] Enable support for PCI-attached cryptographic adapters.
+  * Use control group as base for group CPU scheduler. This reenabled
+    traditional nice behaviour. (closes: #489223)
 
   [ Christian T. Steigies ]
   * [m68k] enable SERIAL_CONSOLE for amiga and atari
diff --git a/debian/config/config b/debian/config/config
index b6e5441bd..7998b37b8 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1903,8 +1903,8 @@ CONFIG_GROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_RT_GROUP_SCHED is not set
 ## choice: Basis for grouping tasks
-CONFIG_USER_SCHED=y
-# CONFIG_CGROUP_SCHED is not set
+# CONFIG_USER_SCHED is not set
+CONFIG_CGROUP_SCHED=y
 ## end choice
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_RESOURCE_COUNTERS is not set