diff --git a/rstatd.init b/rstatd.init
index 9c74e5c..08e2db1 100755
--- a/rstatd.init
+++ b/rstatd.init
@@ -22,7 +22,11 @@
 # Get config.
 . /etc/sysconfig/network
 
+# pidfile: /var/run/rpc.rstatd.pid
+# lockfile: /var/lock/subsys/rpc.rstatd
 RETVAL=0
+LOCK="/var/lock/subsys/rpc.rstatd"
+PIDFILE="/var/run/rpc.rstatd.pid"
 
 start() {
     if [ $UID -ne 0 ] ; then
@@ -39,7 +43,7 @@ start() {
 	RETVAL=$?
 
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rstatd
+	[ $RETVAL -eq 0 ] && touch $LOCK && touch $PIDFILE
 	return $RETVAL
 }	
 
@@ -53,7 +57,7 @@ stop() {
 	RETVAL=$?
 
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rstatd
+	[ $RETVAL -eq 0 ] && rm -f $LOCK && rm -f $PIDFILE
 	return $RETVAL
 }
 
@@ -77,12 +81,16 @@ case "$1" in
   restart|force-reload)
   	restart
 	;;
-  condrestart)
-  	[ -f /var/lock/subsys/rstatd ] && restart || :
+  condrestart|try-restart)
+  	[ -f $LOCK ] && restart || :
 	;;
   reload)
     RETVAL=3
     ;;
+  usage)
+    echo $"Usage: $0 {start|stop|status|restart|reload|force-reload}"
+    RETVAL=0
+    ;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload}"
     RETVAL=2
diff --git a/rusers.spec b/rusers.spec
index 694237b..225ab4b 100644
--- a/rusers.spec
+++ b/rusers.spec
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 56%{?dist}
+Release: 57%{?dist}
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -146,6 +146,11 @@ fi
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Wed Feb 24 2010 Jiri Moskovcak <jmoskovc@redhat.com> - 0.17-57
+- fixed rusersd initscript
+- fixed rstatd initscript
+- Resolves: #523368, #523366
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.17-56
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/rusersd.init b/rusersd.init
index d32db61..e1ca4bc 100755
--- a/rusersd.init
+++ b/rusersd.init
@@ -22,7 +22,11 @@
 # Get config.
 . /etc/sysconfig/network
 
+# pidfile: /var/run/rpc.rusersd.pid
+# lockfile: /var/lock/subsys/rpc.rusersd
 RETVAL=0
+LOCK="/var/lock/subsys/rpc.rusersd"
+PIDFILE="/var/run/rpc.rusersd.pid"
 
 start() {
     if [ $UID -ne 0 ] ; then
@@ -41,7 +45,7 @@ start() {
 	daemon rpc.rusersd
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rusersd
+	[ $RETVAL -eq 0 ] && touch $LOCK && touch $PIDFILE
 	return $RETVAL
 }
 
@@ -54,7 +58,7 @@ stop() {
 	killproc rpc.rusersd
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rusersd
+	[ $RETVAL -eq 0 ] && rm -f $LOCK rm -f $PIDFILE
 	return $RETVAL
 }
 
@@ -81,9 +85,13 @@ case "$1" in
   reload)
     RETVAL=3
     ;;
-  condrestart)
-  	[ -f /var/lock/subsys/rusersd ] && restart || : 
+  condrestart|try-restart)
+  	[ -f $LOCK ] && restart || : 
 	;;
+  usage)
+    echo $"Usage: $0 {start|stop|status|restart|reload|force-reload}"
+    RETVAL=0
+    ;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload}"
 	RETVAL=2