diff --git a/rsync.changes b/rsync.changes
index 4feb078..33d193a 100644
--- a/rsync.changes
+++ b/rsync.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Sep 19 10:55:59 UTC 2010 - jengelh@medozas.de
+
+- rsyncd.rc changes:
+* Do not use killproc -TERM, but just killproc, so that killproc
+  waits until the service is actually shut down, before attempting
+  to restart it (when "restart" is used). Fixes bnc#546977.
+* Change the "reload" action to return "missing" because rsyncd
+  does not handle SIGHUP
+* Adjust "force-reload" accordingly
+
 -------------------------------------------------------------------
 Mon Jan  4 14:21:21 UTC 2010 - puzel@novell.com
 
diff --git a/rsync.spec b/rsync.spec
index 283b636..dab52c3 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -22,7 +22,7 @@
 Name:           rsync
 Summary:        Replacement for RCP/mirror that has Many More Features
 Version:        3.0.7
-Release:        1
+Release:        6
 License:        GPLv3+
 Group:          Productivity/Networking/Other
 AutoReqProv:    on
diff --git a/rsyncd.rc b/rsyncd.rc
index 73b61e7..d7ba778 100644
--- a/rsyncd.rc
+++ b/rsyncd.rc
@@ -76,7 +76,7 @@ case "$1" in
 	## Stop daemon with killproc(8) and if this fails
 	## set echo the echo return value.
 
-	killproc -p $RSYNCD_PID -TERM $RSYNCD_BIN
+	killproc -p $RSYNCD_PID $RSYNCD_BIN
 
 	# Remember status and be verbose
 	rc_status -v
@@ -104,17 +104,14 @@ case "$1" in
 	## do this on signal 1 (SIGHUP).
 	## If it does not support it, restart.
 
-	echo -n "Reload service rsync"
-	killproc -p $RSYNCD_PID -HUP $RSYNCD_BIN
+	echo "Reload service rsync"
+	"$0" restart
 	rc_status -v
 	;;
     reload)
-	## Like force-reload, but if daemon does not support
-	## signalling, do nothing (!)
-
-	# If it supports signalling:
+	# rsyncd does not catch SIGHUP
 	echo -n "Reload service rsync"
-	killproc -p $RSYNCD_PID -HUP $RSYNCD_BIN
+	rc_failed 3
 	rc_status -v
 	;;
     status)