diff --git a/nfs-utils.spec b/nfs-utils.spec
index 178a586..1d52b17 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8.rc2
-Release: 1.FC5
+Release: 2.FC5
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -216,7 +216,10 @@ fi
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
-* Mon Jan  9 2006 1.0.8-1
+* Wed Jan 11 2006 Peter Jones <pjones@redhat.com> 1.0.8.rc2-2.FC5
+- Fix lockfile naming in the initscripts so they're stopped correctly.
+
+* Mon Jan  9 2006 Steve Dickson <SteveD@RedHat.com> 1.0.8.rc2-1.FC5
 - Updated to 1.0.8-rc2 release
 - Broke out libgssapi into its own rpm
 - Move librpcsecgss and libnfsidmap in the new nfs-utils-lib rpm
diff --git a/rpcgssd.init b/rpcgssd.init
index 2059719..74717a8 100755
--- a/rpcgssd.init
+++ b/rpcgssd.init
@@ -33,6 +33,7 @@ fi
 # Try to use machine credentials by default
 OPTIONS=""
 RETVAL=0
+LOCKFILE=/var/lock/subsys/rpcgssd
 prog="rpc.gssd"
 
 case "$1" in
@@ -41,7 +42,7 @@ case "$1" in
 	if status $prog > /dev/null ; then
 		exit 0
 	fi
-	rm -f /var/lock/subsys/$prog
+	rm -f $LOCKFILE
 
 	echo -n $"Starting RPC gssd: "
 
@@ -70,7 +71,7 @@ case "$1" in
 	daemon $prog ${OPTIONS}
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.gssd
+	[ $RETVAL -eq 0 ] && touch $LOCKFILE
 	;;
   stop)
 	# Stop daemon.
@@ -78,7 +79,7 @@ case "$1" in
 	killproc $prog
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.gssd
+	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
 	;;
   status)
 	status rpc.gssd
@@ -90,7 +91,7 @@ case "$1" in
 	RETVAL=$?
 	;;
   condrestart)
-	if [ -f /var/lock/subsys/rpc.gssd ]; then
+	if [ -f $LOCKFILE ]; then
 		$0 restart
 		RETVAL=$?
 	fi
diff --git a/rpcidmapd.init b/rpcidmapd.init
index e3e0667..ce5fd18 100755
--- a/rpcidmapd.init
+++ b/rpcidmapd.init
@@ -24,6 +24,7 @@ fi
 
 OPTIONS=""
 RETVAL=0
+LOCKFILE=/var/lock/subsys/rpcidmapd
 prog="rpc.idmapd"
 
 case "$1" in
@@ -33,7 +34,7 @@ case "$1" in
 		killproc $prog "-SIGHUP" > /dev/null
 		exit 0
 	}
-	rm -f /var/lock/subsys/$prog
+	rm -f $LOCKFILE
 
 	echo -n $"Starting RPC idmapd: "
 
@@ -56,7 +57,7 @@ case "$1" in
 	daemon $prog ${OPTIONS}
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.idmapd
+	[ $RETVAL -eq 0 ] && touch $LOCKFILE
 	;;
   stop)
 	# Stop daemon.
@@ -64,7 +65,7 @@ case "$1" in
 	killproc $prog
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.idmapd
+	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
 	;;
   status)
 	status rpc.idmapd
@@ -76,7 +77,7 @@ case "$1" in
 	RETVAL=$?
 	;;
   condrestart)
-	if [ -f /var/lock/subsys/rpc.idmapd ]; then
+	if [ -f $LOCKFILE ]; then
 		$0 restart
 		RETVAL=$?
 	fi
diff --git a/rpcsvcgssd.init b/rpcsvcgssd.init
index 58f3829..0ea29e8 100755
--- a/rpcsvcgssd.init
+++ b/rpcsvcgssd.init
@@ -31,6 +31,7 @@ fi
 
 OPTIONS=""
 RETVAL=0
+LOCKFILE=/var/lock/subsys/rpcsvcgssd
 prog="rpc.svcgssd"
 
 case "$1" in
@@ -39,7 +40,7 @@ case "$1" in
 	if status $prog > /dev/null ; then
 		exit 0
 	fi
-	rm -f /var/lock/subsys/$prog
+	rm -f $LOCKFILE
 
 	echo -n $"Starting RPC svcgssd: "
 
@@ -69,7 +70,7 @@ case "$1" in
 	daemon $prog ${OPTIONS}
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.svcgssd
+	[ $RETVAL -eq 0 ] && touch $LOCKFILE
 	;;
   stop)
 	# Stop daemon.
@@ -77,7 +78,7 @@ case "$1" in
 	killproc $prog
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.svcgssd
+	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
 	;;
   status)
 	status rpc.svcgssd
@@ -89,7 +90,7 @@ case "$1" in
 	RETVAL=$?
 	;;
   condrestart)
-	if [ -f /var/lock/subsys/rpc.svcgssd ]; then
+	if [ -f $LOCKFILE ]; then
 		$0 restart
 		RETVAL=$?
 	fi