diff --git a/courier-imap-ssl.init b/courier-imap-ssl.init
index 352f829..c615098 100644
--- a/courier-imap-ssl.init
+++ b/courier-imap-ssl.init
@@ -91,8 +91,11 @@ case "$1" in
 	;;
     status)
 	echo -n "Checking for Courier-IMAP (SSL)"
-	/sbin/checkproc -p $SSLPIDFILE /usr/sbin/courierlogger
-	rc_status -v
+    /sbin/checkproc -k -p $PIDFILE /usr/sbin/courierlogger
+    if [ $? -eq 7 ]; then
+            rc_failed 3
+    fi;
+    rc_status -v
 	;;
     probe)
 	test /etc/courier/imapd -nt $SSLPIDFILE && echo restart
diff --git a/courier-imap.changes b/courier-imap.changes
index 92be4fb..bd952ea 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 22 08:53:39 CET 2007 - mskibbe@suse.de
+
+- checkproc uses -p parameter not as specified in man page
+  (#230806)
+
 -------------------------------------------------------------------
 Mon Sep 11 13:05:45 CEST 2006 - tpatzig@suse.de
 
diff --git a/courier-imap.init b/courier-imap.init
index 93af18a..bf38cc5 100644
--- a/courier-imap.init
+++ b/courier-imap.init
@@ -79,8 +79,11 @@ case "$1" in
 	;;
     status)
 	echo -n "Checking for Courier-IMAP "
-	/sbin/checkproc -p $PIDFILE /usr/sbin/courierlogger
-	rc_status -v
+    /sbin/checkproc -k -p $PIDFILE /usr/sbin/courierlogger
+    if [ $? -eq 7 ]; then
+            rc_failed 3
+    fi;
+    rc_status -v
 	;;
     probe)
 	test /etc/courier/imapd -nt $PIDFILE && echo restart
diff --git a/courier-imap.spec b/courier-imap.spec
index 0f8691f..2faa7f4 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package courier-imap (Version 4.1.1)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -15,8 +15,8 @@ BuildRequires:  courier-authlib-devel fam-devel gcc-c++ libstdc++-devel openssl-
 URL:            http://www.courier-mta.org/imap/
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 Version:        4.1.1
-Release:        5
-License:        GPL
+Release:        29
+License:        GNU General Public License (GPL)
 Conflicts:      imap qpopper
 Group:          Productivity/Networking/Email/Servers
 Obsoletes:      %{name}-ldap
@@ -175,6 +175,9 @@ exit 0
 rm -rf $RPM_BUILD_ROOT
 
 %changelog -n courier-imap
+* Mon Jan 22 2007 - mskibbe@suse.de
+- checkproc uses -p parameter not as specified in man page
+  (#230806)
 * Mon Sep 11 2006 - tpatzig@suse.de
 - Add Conflict to qpopper
 * Tue Aug 01 2006 - mskibbe@suse.de
diff --git a/courier-pop-ssl.init b/courier-pop-ssl.init
index 507de82..948e6d8 100644
--- a/courier-pop-ssl.init
+++ b/courier-pop-ssl.init
@@ -90,8 +90,11 @@ case "$1" in
 	;;
     status)
 	echo -n "Checking for Courier-POP3 (SSL)"
-	/sbin/checkproc -p $SSLPIDFILE /usr/sbin/courierlogger
-	rc_status -v
+    /sbin/checkproc -k -p $PIDFILE /usr/sbin/courierlogger
+    if [ $? -eq 7 ]; then
+            rc_failed 3
+    fi;
+    rc_status -v
 	;;
     probe)
 	test /etc/courier/pop3d -nt $SSLPIDFILE && echo restart
diff --git a/courier-pop.init b/courier-pop.init
index 6eebf93..8912229 100644
--- a/courier-pop.init
+++ b/courier-pop.init
@@ -76,8 +76,11 @@ case "$1" in
 	;;
     status)
 	echo -n "Checking for Courier-POP3 "
-	/sbin/checkproc -p $PIDFILE /usr/sbin/courierlogger
-	rc_status -v
+    /sbin/checkproc -k -p $PIDFILE /usr/sbin/courierlogger
+    if [ $? -eq 7 ]; then
+            rc_failed 3
+    fi;
+    rc_status -v
 	;;
     probe)
 	test /etc/courier/pop3d -nt $PIDFILE && echo restart