diff --git a/nfs-utils.spec b/nfs-utils.spec
index fe5cf88..7f2109d 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -257,9 +257,11 @@ fi
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
-* Tue Sep  6 2005 Steve Dickson <SteveD@RedHat.com> 1.0.7-16
-- The nfslock init script no longer needs to bring lockd
-  down. (bz 162446)
+* Tue Sep  8 2005 Steve Dickson <SteveD@RedHat.com> 1.0.7-16
+- Reworked the nfslock init script so if lockd is running
+  it will be killed which is what the HA community needs. (bz 162446)
+- Stopped rpcidmapd.init from doing extra echoing when
+  condstart-ed.
 
 * Wed Aug 24 2005 Peter Jones <pjones@redhat.com> - 1.0.7-15
 - don't strip during "make install", so debuginfo packages are generated right
diff --git a/nfslock.init b/nfslock.init
index 9284cbb..7d8d5e7 100755
--- a/nfslock.init
+++ b/nfslock.init
@@ -74,11 +74,11 @@ start() {
 
 stop() {
 	# Stop daemons.
-	echo -n $"Stopping NFS locking: "
-	if [ "$USERLAND_LOCKD" ]; then
-	   killproc lockd
+	if [ -n "`pidofproc lockd`" ]; then
+		echo -n $"Stopping NFS locking: "
+		killproc lockd -KILL
+		echo
 	fi
-	echo
 	echo -n $"Stopping NFS statd: "
 	killproc rpc.statd
 	RETVAL=0
diff --git a/rpcidmapd.init b/rpcidmapd.init
index be2c9f2..e3e0667 100755
--- a/rpcidmapd.init
+++ b/rpcidmapd.init
@@ -29,10 +29,10 @@ prog="rpc.idmapd"
 case "$1" in
   start|condstart)
 	# Make sure the daemon is not already running.
-	if status $prog > /dev/null ; then
-		[ "$1" = "condstart" ] && killproc $prog "-SIGHUP"
+	[ "$1" = "condstart" -a -n "`pidofproc $prog`" ] && {
+		killproc $prog "-SIGHUP" > /dev/null
 		exit 0
-	fi
+	}
 	rm -f /var/lock/subsys/$prog
 
 	echo -n $"Starting RPC idmapd: "