diff --git a/debian/changelog b/debian/changelog
index fae10ace5..c6fe79bf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ linux-2.6 (2.6.32~rc5-1) UNRELEASED; urgency=low
   [ Bastian Blank ]
   * [mips] Don't force EMBEDDED on.
   * [sparc] Don't builtin Ext2 support.
-  * Enable PERF_EVENTS, EVENT_PROFILE, CRYPTO_VMAC, CRYPTO_GHASH.
+  * Enable PERF_EVENTS, EVENT_PROFILE, CRYPTO_VMAC, CRYPTO_GHASH, TREE_RCU.
   * Use SLUB as default SLAB allocator.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 26 Oct 2009 01:18:26 +0000
diff --git a/debian/config/config b/debian/config/config
index 93cff0884..851de916c 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2914,9 +2914,12 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 ## choice: RCU Implementation
-# CONFIG_TREE_RCU is not set
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
 ## end choice
 # CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_GROUP_SCHED=y
@@ -3795,7 +3798,6 @@ CONFIG_INITRAMFS_SOURCE=""
 ## file: unknown
 ##
 # CONFIG_AGNX is not set
-CONFIG_CLASSIC_RCU=y
 CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
 # CONFIG_EPL is not set
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index df13f227f..8f9e93fce 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -130,11 +130,7 @@ CONFIG_FB_MATROX_MAVEN=m
 ##
 ## file: init/Kconfig
 ##
-## choice: RCU Implementation
-CONFIG_TREE_RCU=y
-## end choice
 CONFIG_RCU_FANOUT=64
-# CONFIG_RCU_FANOUT_EXACT is not set
 
 ##
 ## file: lib/Kconfig.debug