diff --git a/debian/changelog b/debian/changelog
index ea4cb3d64..192d30529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,7 @@ linux-2.6 (2.6.31-1~experimental.1) UNRELEASED; urgency=low
   * Disable old USB_DEVICE_CLASS. (Closes: #510279)
   * Drop yaird initramfs generator support.
   * Add stable release 2.6.31.1.
+  * Enable PREEMPT_VOLUNTARY.
 
   [ Ben Hutchings ]
   * mga: remove unnecessary change from firmware-loading patch
diff --git a/debian/config/config b/debian/config/config
index c403e4d60..ae0cb5ab4 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2815,8 +2815,8 @@ CONFIG_PM_STD_PARTITION=""
 ## file: kernel/Kconfig.preempt
 ##
 ## choice: Preemption Model
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 ## end choice