diff --git a/debian/changelog b/debian/changelog
index 55f2c1c7e..034770a43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ linux-2.6 (2.6.39~rc7-1~experimental.2) UNRELEASED; urgency=low
   * [!x86] Disable TPM drivers. TPMs are currently only fitted in PCs.
   * rt2800usb: Enable support for more USB devices including
     Linksys WUSB600N (Closes: #596626)
+  * mm: Select SLAB allocator again. Although SLUB is currently the
+    upstream default, this was set as an experiment rather than a
+    recommendation! SLUB generally has poorer performance than SLAB on
+    larger systems.
 
  -- maximilian attems <maks@debian.org>  Tue, 10 May 2011 23:24:26 +0200
 
diff --git a/debian/config/config b/debian/config/config
index 73e33c34d..33a6c9214 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3442,8 +3442,8 @@ CONFIG_PERF_EVENTS=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_COMPAT_BRK is not set
 ## choice: Choose SLAB allocator
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
 ## end choice
 CONFIG_PROFILING=y