diff --git a/nfs-utils.spec b/nfs-utils.spec
index 69c1aa1..6066e0c 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -264,6 +264,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue Nov 3 2009 Steve Dickson <steved@redhat.com> 1.2.0-18
+- Reworked and remove some of the Default-Start/Stop stanzas
+  in the init scripts (bz 531425)
+
 * Mon Nov 2 2009 Steve Dickson <steved@redhat.com> 1.2.0-17
 - Updated to the latest pseudo root release (rel7).
 - Added upstream 1.2.1-rc7 patch which fixes:
diff --git a/nfs.init b/nfs.init
index 290cd53..6e9d691 100755
--- a/nfs.init
+++ b/nfs.init
@@ -3,7 +3,7 @@
 # nfs           This shell script takes care of starting and stopping
 #               the NFS services.
 #
-# chkconfig: - 60 20
+# chkconfig: - 30 60
 # description: NFS is a popular protocol for file sharing across networks.
 #              This service provides NFS server functionality, which is \
 #              configured via the /etc/exports file.
@@ -14,7 +14,6 @@
 # Provides: nfs
 # Required-Start: $local_fs $network $syslog
 # Required-Stop: $local_fs $network $syslog
-# Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: Start up the NFS server sevice
 # Description: NFS is a popular protocol for file sharing across networks \
diff --git a/nfslock.init b/nfslock.init
index 4579006..71a9940 100755
--- a/nfslock.init
+++ b/nfslock.init
@@ -13,7 +13,7 @@
 # Provides: nfslock
 # Required-Start: $network $syslog
 # Required-Stop: $network $syslog
-# Default-Start: 2 3 4 5
+# Default-Start: 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: Start up the NFS file locking sevice
 # Description: NFS is a popular protocol for file sharing across \
diff --git a/rpcgssd.init b/rpcgssd.init
index 9abc5ee..1b548a9 100755
--- a/rpcgssd.init
+++ b/rpcgssd.init
@@ -10,7 +10,7 @@
 # Provides: rpcgssd
 # Required-Start: $network $syslog
 # Required-Stop: $network $syslog
-# Default-Start: 2 3 4 5
+# Default-Start: 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: Starts the RPCSEC GSS client daemon
 # Description: NFS is a popular protocol for file sharing across \
diff --git a/rpcidmapd.init b/rpcidmapd.init
index 35ae247..c944454 100755
--- a/rpcidmapd.init
+++ b/rpcidmapd.init
@@ -10,7 +10,7 @@
 # Provides: rpcidmapd
 # Required-Start: $network $syslog
 # Required-Stop: $network $syslog
-# Default-Start: 2 3 4 5
+# Default-Start: 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: Starts the NFSv4 id mapping daemon
 # Description: NFS is a popular protocol for file sharing across \
diff --git a/rpcsvcgssd.init b/rpcsvcgssd.init
index 5d6cb6d..6f5659d 100755
--- a/rpcsvcgssd.init
+++ b/rpcsvcgssd.init
@@ -2,7 +2,7 @@
 #
 # rpcsvcgssd    Start up and shut down RPCSEC GSS daemon
 #
-# chkconfig: - 19 69
+# chkconfig: - 31 69
 # description: Starts user-level daemon that manages RPCSEC GSS contexts \
 #	       for the NFS server.
 
@@ -10,7 +10,6 @@
 # Provides: rpcsvcgssd
 # Required-Start: $network $syslog
 # Required-Stop: $network $syslog
-# Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: Starts the RPCSEC GSS server daemon
 # Description: NFS is a popular protocol for file sharing across \