diff -u pm-utils-1.1.2.4/debian/changelog pm-utils-1.1.2.4/debian/changelog
--- pm-utils-1.1.2.4/debian/changelog
+++ pm-utils-1.1.2.4/debian/changelog
@@ -1,3 +1,16 @@
+pm-utils (1.1.2.4-1ubuntu6) intrepid; urgency=low
+
+  * Drop debian/patches/10-sleep-module-auto-detection.patch as we don't
+    want to use uswsusp unless the user explicitly chooses it. Also downgrade
+    uswsusp from Recommends to Suggests, as while it won't change the default
+    install (as pm-utils is installed but uswsusp isn't) it better reflects
+    the relationship between the packages. (LP: #267141)
+  * Add an example file /etc/pm/config.d/00sleep_module that shows the user
+    how to change the sleep module in use, for instance if they want to
+    enable uswsusp.
+
+ -- James Westby <james.westby@canonical.com>  Fri, 26 Sep 2008 12:28:19 +0100
+
 pm-utils (1.1.2.4-1ubuntu5) intrepid; urgency=low
 
   * Drop 30-swap-file.patch again. Reportedly, resuming from a swap file works
diff -u pm-utils-1.1.2.4/debian/rules pm-utils-1.1.2.4/debian/rules
--- pm-utils-1.1.2.4/debian/rules
+++ pm-utils-1.1.2.4/debian/rules
@@ -23,4 +23,6 @@
 	rm -f debian/pm-utils/usr/share/man/man8/pm-pmu.8
 
+	cp debian/00sleep_module debian/pm-utils/etc/pm/config.d/
+
 	chmod -x debian/pm-utils/usr/lib/pm-utils/defaults
 
diff -u pm-utils-1.1.2.4/debian/control pm-utils-1.1.2.4/debian/control
--- pm-utils-1.1.2.4/debian/control
+++ pm-utils-1.1.2.4/debian/control
@@ -13,8 +13,8 @@
 Package: pm-utils
 Architecture: all
 Depends: ${misc:Depends}, powermgmt-base, kbd | console-tools
-Recommends: hal (>= 0.5.9), uswsusp [amd64 i386 powerpc], vbetool [amd64 i386], radeontool
-Suggests: cpufrequtils
+Recommends: hal (>= 0.5.9), vbetool [amd64 i386], radeontool
+Suggests: cpufrequtils, uswsusp [amd64 i386 powerpc]
 Description: utilities and scripts for power management
  This package provides simple shell command line tools to suspend and 
  hibernate your computer.
reverted:
--- pm-utils-1.1.2.4/debian/patches/10-sleep-module-auto-detection.patch
+++ pm-utils-1.1.2.4.orig/debian/patches/10-sleep-module-auto-detection.patch
@@ -1,35 +0,0 @@
-Index: pm-utils/pm/pm-functions.in
-===================================================================
---- pm-utils.orig/pm/pm-functions.in	2008-05-29 15:13:37.000000000 +0200
-+++ pm-utils/pm/pm-functions.in	2008-06-11 13:28:40.000000000 +0200
-@@ -36,7 +36,7 @@
- # and end users should modify these using files in /etc/pm/config.
- HIBERNATE_MODE=""
- HIBERNATE_RESUME_POST_VIDEO="no"
--SLEEP_MODULE="kernel"
-+SLEEP_MODULE="auto"
- # These variables will be handled specially when we load the config file.
- SUSPEND_MODULES=""
- HOOK_BLACKLIST=""
-@@ -200,6 +200,21 @@
- }
- 
- 
-+if [ "$SLEEP_MODULE" = auto ]; then
-+	# default is kernel
-+	SLEEP_MODULE="kernel"
-+
-+	# Try userspace software suspend
-+	if [ -c /dev/snapshot ] && command_exists s2disk ; then
-+		SLEEP_MODULE="uswsusp"
-+	fi
-+
-+	# Try TuxOnIce
-+	if [ -d "/sys/power/tuxonice" ] || [ -d "/sys/power/suspend2" ]; then
-+		SLEEP_MODULE="tuxonice"
-+	fi
-+fi
-+
- SLEEP_FUNCTIONS="${PM_UTILS_LIBDIR}/module.d/${SLEEP_MODULE}"
- [ -f "${SLEEP_FUNCTIONS}" ] || { 
- 	echo "Requested sleep module $SLEEP_MODULE not available."
diff -u pm-utils-1.1.2.4/debian/patches/series pm-utils-1.1.2.4/debian/patches/series
--- pm-utils-1.1.2.4/debian/patches/series
+++ pm-utils-1.1.2.4/debian/patches/series
@@ -1,4 +1,3 @@
-10-sleep-module-auto-detection.patch
 25-pmu.patch
 80-service.patch
 99-ubuntu-acpi-support-vbestate.patch
only in patch2:
unchanged:
--- pm-utils-1.1.2.4.orig/debian/00sleep_module
+++ pm-utils-1.1.2.4/debian/00sleep_module
@@ -0,0 +1,9 @@
+# The sleep/wake system to use.  Valid values are:
+#   kernel    The built-in kernel suspend/resume support.
+#             Use this if nothing else is supported on your system.
+#   uswsusp   If your system has support for the userspace
+#             suspend programs (s2ram/s2disk/s2both), then use this.
+#   tuxonice  If your system has support for tuxonice, use this.
+#
+# The system defaults to "kernel" if this is commented out.
+# SLEEP_MODULE="kernel"