diff --git a/debian/arch/i386/config b/debian/arch/i386/config
index 68080b349..cab70f2fd 100644
--- a/debian/arch/i386/config
+++ b/debian/arch/i386/config
@@ -55,7 +55,8 @@ CONFIG_MTRR=y
 # CONFIG_REGPARM is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
-# CONFIG_SOFTWARE_SUSPEND is not set
+CONFIG_SOFTWARE_SUSPEND=y
+CONFIG_PM_STD_PARTITION=""
 CONFIG_ACPI=y
 CONFIG_ACPI_BOOT=y
 CONFIG_ACPI_INTERPRETER=y
diff --git a/debian/changelog b/debian/changelog
index 02a11f802..af72f4d89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,11 @@ linux-2.6 (2.6.14-3) UNRELEASED; urgency=low
   [ Sven Luther ]
   * Set default TCP congestion algorithm to NewReno + BIC (Closes: #337089)
 
- -- Sven Luther <luther@debian.org>  Wed,  2 Nov 2005 16:35:12 +0000
+  [ maximilian attems ]
+  * Reenable CONFIG_SOFTWARE_SUSPEND on i386, resume=/dev/<other device> must
+    be set by boot loader.
+
+ -- maximilian attems <maks@sternwelten.at>  Thu,  3 Nov 2005 12:06:29 +0100
 
 linux-2.6 (2.6.14-2) unstable; urgency=low