diff --git a/man/pm-action.xml b/man/pm-action.xml
index 0bacca5..379d10f 100644
--- a/man/pm-action.xml
+++ b/man/pm-action.xml
@@ -451,7 +451,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><envar>HIBERNATE_RESUME_POST_VIDEO [=no]</envar></term>
+        <term><envar>HIBERNATE_RESUME_POST_VIDEO [=false]</envar></term>
         <listitem>
           <para>
             If video should be posted after hibernate, just like
@@ -488,15 +488,16 @@
 	</listitem>
 	</varlistentry>
 	<varlistentry>
-        <term><envar>NEED_CLOCK_SYNC</envar></term>
+        <term><envar>NEED_CLOCK_SYNC [=false]</envar></term>
         <listitem>
-		<para>
-			If your system clock drifts across a suspend/resume or
-			hibernate/thaw cycle, you should set this to true.
-			This will cause pm-utils to synchronize the system clock
-			whenever we go through a sleep/wake cycle at the expense of 
-			making suspend/resume take longer.
-          </para>
+         <para>
+          If your system clock drifts across a suspend/resume or
+          hibernate/thaw cycle, you should set this to true.
+          This will cause pm-utils to synchronize the system clock
+          whenever we go through a sleep/wake cycle at the expense of
+          making suspend/resume take longer.
+          You should not normally need to set this.
+         </para>
 	</listitem>
       </varlistentry>
 
diff --git a/pm/defaults b/pm/defaults
index db4d59a..ff3ca9d 100644
--- a/pm/defaults
+++ b/pm/defaults
@@ -16,8 +16,8 @@
 # hibernate. You should not normally need to set this.  
 # In the future pm-utils will get this setting from HAL.
 #
-# Valid values are "no" and "yes"
-# HIBERNATE_RESUME_POST_VIDEO="no"
+# Valid values are "true" and "false"
+# HIBERNATE_RESUME_POST_VIDEO="false"
 
 # The default sleep/wake system to use.  Valid values are:
 #   kernel    The built-in kernel suspend/resume support.
@@ -49,4 +49,6 @@
 
 # If you need to synchronize the system clock across a suspend/resume or
 # hibernate/thaw cycle, set this variable.
-# NEED_CLOCK_SYNC="true"
+#
+# Valid values are "true" and "false"
+# NEED_CLOCK_SYNC="false"
diff --git a/pm/pm-functions.in b/pm/pm-functions.in
index 8ba975c..bc370ff 100644
--- a/pm/pm-functions.in
+++ b/pm/pm-functions.in
@@ -34,7 +34,7 @@ LC_COLLATE=C
 # Specifically, distros should override these by modifying defaults,
 # and end users should modify these using files in /etc/pm/config.
 HIBERNATE_MODE=""
-HIBERNATE_RESUME_POST_VIDEO="no"
+HIBERNATE_RESUME_POST_VIDEO="false"
 SLEEP_MODULE="kernel"
 # These variables will be handled specially when we load the config file.
 SUSPEND_MODULES=""
diff --git a/pm/sleep.d/90clock b/pm/sleep.d/90clock
index 5df6e8e..14bdbd1 100755
--- a/pm/sleep.d/90clock
+++ b/pm/sleep.d/90clock
@@ -15,7 +15,7 @@ resume_clock()
 	/sbin/hwclock --hctosys >/dev/null 2>&1 0<&1
 }
 
-[ "$NEED_CLOCK_SYNC" ] || exit $NA
+[ "$NEED_CLOCK_SYNC" = "true" ] || exit $NA
 
 case "$1" in
 	hibernate|suspend) suspend_clock ;;
diff --git a/pm/sleep.d/99video b/pm/sleep.d/99video
index 23e56ef..518fb6a 100755
--- a/pm/sleep.d/99video
+++ b/pm/sleep.d/99video
@@ -204,13 +204,15 @@ help() {
 case "$1" in
 	suspend) maybe_chvt; suspend_video ;;
 	hibernate) maybe_chvt
-		if [ "$HIBERNATE_RESUME_POST_VIDEO" = "yes" ]; then
+		if [ "$HIBERNATE_RESUME_POST_VIDEO" = "yes" ] ||
+		   [ "$HIBERNATE_RESUME_POST_VIDEO" = "true" ]; then
 			suspend_video
 		fi
 		;;
 	resume) resume_video; maybe_deallocvt;;
 	thaw)
-		if [ "${HIBERNATE_RESUME_POST_VIDEO}" = "yes" ]; then
+		if [ "$HIBERNATE_RESUME_POST_VIDEO" = "yes" ] ||
+		   [ "$HIBERNATE_RESUME_POST_VIDEO" = "true" ]; then
 			resume_video
 		fi
 		maybe_deallocvt