diff --git a/debian/changelog b/debian/changelog
index 11bb356cc..6f25112f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,9 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
   * Pass `DEB_MAINT_PARAMS' to hook scripts. (closes: #563161)
   * Enable more mobile IPv6 needs. (closes: #528834)
 
+  [ dann frazier ]
+  * [vserver] explicitly disable CFS_HARD_LIMITS
+
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 10 Jan 2010 17:38:50 +0000
 
 linux-2.6 (2.6.32-5) unstable; urgency=low
diff --git a/debian/config/featureset-vserver/config b/debian/config/featureset-vserver/config
index 98eb26308..bc74999b2 100644
--- a/debian/config/featureset-vserver/config
+++ b/debian/config/featureset-vserver/config
@@ -3,6 +3,11 @@
 ##
 CONFIG_BLK_DEV_VROOT=y
 
+##
+## file: init/Kconfig
+##
+# CONFIG_CFS_HARD_LIMITS is not set
+
 ##
 ## file: kernel/vserver/Kconfig
 ##