diff --git a/nfs-utils.spec b/nfs-utils.spec
index 4037440..c58c5aa 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.6
-Release: 38
+Release: 39
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -263,6 +263,10 @@ fi
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Sun Oct 17 2004 Steve Dickson <SteveD@RedHat.com>
+- Changed nfs.init to bring down rquotad correctly
+  (bz# 136041)
+
 * Thu Oct 14 2004 Steve Dickson <SteveD@RedHat.com>
 - Added "$RQUOTAD_PORT" variable to nfs.init which
   allows the rpc.rquotad to use a predefined port
diff --git a/nfs.init b/nfs.init
index 617fa1e..cabe609 100755
--- a/nfs.init
+++ b/nfs.init
@@ -100,7 +100,7 @@ case "$1" in
 	echo -n $"Shutting down NFS daemon: "
 	killproc nfsd
 	echo
-	if [ -n "$RQUOTAD" ]; then
+	if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then
 		echo -n $"Shutting down NFS quotas: "
 		killproc rpc.rquotad
 		echo
@@ -120,7 +120,7 @@ case "$1" in
   status)
 	status rpc.mountd
 	status nfsd
-	if [ -n "$RQUOTAD" ]; then
+	if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then
 		status rpc.rquotad
 	fi
 	;;