diff --git a/cups.init b/cups.init
index 697852b..b9c767a 100644
--- a/cups.init
+++ b/cups.init
@@ -32,13 +32,7 @@
 # Linux
 
 # Source function library.
-if [ -f /etc/init.d/functions ] ; then
-	. /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-	. /etc/rc.d/init.d/functions
-else
-	exit 0
-fi
+. /etc/init.d/functions
 
 DAEMON=cupsd
 
@@ -90,6 +84,7 @@ case $1 in
 	;;
 	status)
 		status $DAEMON
+		RETVAL=$?
 	;;
 	restartlog)
 		stop
@@ -99,7 +94,7 @@ case $1 in
 	*)
 
 	echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
-	exit 1
+	exit 3
 esac
 
 exit $RETVAL
diff --git a/cups.spec b/cups.spec
index 392b2f7..8a1b857 100644
--- a/cups.spec
+++ b/cups.spec
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -442,6 +442,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Apr 26 2007 Tim Waugh <twaugh@redhat.com> 1:1.2.10-8
+- Initscript fixes (bug #237955).
+
 * Wed Apr 25 2007 Tim Waugh <twaugh@redhat.com> 1:1.2.10-7
 - Until bug #236736 is fixed, work around the kernel usblp driver's
   quirks so that we can detect paper-out conditions.