diff --git a/cvs/rc.cvs b/cvs/rc.cvs
index 54536bde81..206a0d7196 100644
--- a/cvs/rc.cvs
+++ b/cvs/rc.cvs
@@ -23,9 +23,9 @@
 %stop -p 200 -u root
     if opServiceEnabled cvs_pserverd; then
         if [ -f $cvs_pserverd_pidfile ]; then
-            kill -TERM `cat $cvs_pserverd_pidfile`
-            sleep f
-            kill -KILL `cat $cvs_pserverd_pidfile`
+            kill -TERM `cat $cvs_pserverd_pidfile` >/dev/null 2>&1 || true
+            sleep 2
+            kill -KILL `cat $cvs_pserverd_pidfile` >/dev/null 2>&1 || true
             rm -f $cvs_pserverd_pidfile >/dev/null 2>&1 || true
         fi
     fi