diff -up nfs-utils-1.3.0/systemd/auth-rpcgss-module.service.orig nfs-utils-1.3.0/systemd/auth-rpcgss-module.service
--- nfs-utils-1.3.0/systemd/auth-rpcgss-module.service.orig	2015-06-25 15:01:27.650527038 -0400
+++ nfs-utils-1.3.0/systemd/auth-rpcgss-module.service	2015-06-25 15:01:45.166856358 -0400
@@ -6,6 +6,7 @@
 # unit will fail.  But that's OK.)
 [Unit]
 Description=Kernel Module supporting RPCSEC_GSS
+DefaultDependencies=no
 Before=gssproxy.service rpc-svcgssd.service rpc-gssd.service
 Wants=gssproxy.service rpc-svcgssd.service rpc-gssd.service
 ConditionPathExists=/etc/krb5.keytab
diff -up nfs-utils-1.3.0/systemd/nfs-config.service.orig nfs-utils-1.3.0/systemd/nfs-config.service
--- nfs-utils-1.3.0/systemd/nfs-config.service.orig	2014-03-25 11:12:07.000000000 -0400
+++ nfs-utils-1.3.0/systemd/nfs-config.service	2015-06-25 15:01:45.166856358 -0400
@@ -1,5 +1,7 @@
 [Unit]
 Description=Preprocess NFS configuration
+After=local-fs.target
+DefaultDependencies=no
 
 [Service]
 Type=oneshot
diff -up nfs-utils-1.3.0/systemd/nfs-idmapd.service.orig nfs-utils-1.3.0/systemd/nfs-idmapd.service
--- nfs-utils-1.3.0/systemd/nfs-idmapd.service.orig	2015-06-25 15:01:27.663527282 -0400
+++ nfs-utils-1.3.0/systemd/nfs-idmapd.service	2015-06-25 15:01:45.166856358 -0400
@@ -1,7 +1,8 @@
 [Unit]
 Description=NFSv4 ID-name mapping service
+DefaultDependencies=no
 Requires=var-lib-nfs-rpc_pipefs.mount
-After=var-lib-nfs-rpc_pipefs.mount
+After=var-lib-nfs-rpc_pipefs.mount local-fs.target
 
 BindsTo=nfs-server.service
 
diff -up nfs-utils-1.3.0/systemd/nfs-mountd.service.orig nfs-utils-1.3.0/systemd/nfs-mountd.service
--- nfs-utils-1.3.0/systemd/nfs-mountd.service.orig	2015-06-25 15:01:27.657527169 -0400
+++ nfs-utils-1.3.0/systemd/nfs-mountd.service	2015-06-25 15:01:45.166856358 -0400
@@ -1,8 +1,9 @@
 [Unit]
 Description=NFS Mount Daemon
+DefaultDependencies=no
 Requires=proc-fs-nfsd.mount
 After=proc-fs-nfsd.mount
-After=network.target
+After=network.target local-fs.target
 BindsTo=nfs-server.service
 
 Wants=nfs-config.service
diff -up nfs-utils-1.3.0/systemd/nfs-server.service.orig nfs-utils-1.3.0/systemd/nfs-server.service
--- nfs-utils-1.3.0/systemd/nfs-server.service.orig	2015-06-25 15:01:45.166856358 -0400
+++ nfs-utils-1.3.0/systemd/nfs-server.service	2015-06-25 15:02:29.916697572 -0400
@@ -1,11 +1,13 @@
 [Unit]
 Description=NFS server and services
-Requires= network.target proc-fs-nfsd.mount rpcbind.target
+DefaultDependencies=no
+Requires= network.target proc-fs-nfsd.mount rpcbind.service
 Requires= nfs-mountd.service
 Wants=rpc-statd.service nfs-idmapd.service
 Wants=rpc-statd-notify.service
 
-After= network.target proc-fs-nfsd.mount rpcbind.target nfs-mountd.service
+After= local-fs.target
+After= network.target proc-fs-nfsd.mount rpcbind.service nfs-mountd.service
 After= nfs-idmapd.service rpc-statd.service
 Before= rpc-statd-notify.service
 
diff -up nfs-utils-1.3.0/systemd/rpc-statd-notify.service.orig nfs-utils-1.3.0/systemd/rpc-statd-notify.service
--- nfs-utils-1.3.0/systemd/rpc-statd-notify.service.orig	2015-06-25 15:01:27.658527188 -0400
+++ nfs-utils-1.3.0/systemd/rpc-statd-notify.service	2015-06-25 15:05:13.667774624 -0400
@@ -1,7 +1,8 @@
 [Unit]
 Description=Notify NFS peers of a restart
-Requires=network-online.target
-After=network-online.target nss-lookup.target
+DefaultDependencies=no
+Requires=network.target
+After=local-fs.target network.target nss-lookup.target
 
 # Do not start up in HA environments
 ConditionPathExists=!/var/lib/nfs/statd/sm.ha
diff -up nfs-utils-1.3.0/systemd/rpc-svcgssd.service.orig nfs-utils-1.3.0/systemd/rpc-svcgssd.service
--- nfs-utils-1.3.0/systemd/rpc-svcgssd.service.orig	2014-03-25 11:12:07.000000000 -0400
+++ nfs-utils-1.3.0/systemd/rpc-svcgssd.service	2015-06-25 15:01:45.166856358 -0400
@@ -1,7 +1,8 @@
 [Unit]
 Description=RPC security service for NFS server
+DefaultDependencies=no
 Requires=var-lib-nfs-rpc_pipefs.mount
-After=var-lib-nfs-rpc_pipefs.mount
+After=var-lib-nfs-rpc_pipefs.mount local-fs.target
 PartOf=nfs-server.service
 PartOf=nfs-utils.service
 
diff -up nfs-utils-1.3.0/systemd/rpc-statd.service.orig nfs-utils-1.3.0/systemd/rpc-statd.service
--- nfs-utils-1.3.0/systemd/rpc-statd.service.orig	2014-03-25 11:12:07.000000000 -0400
+++ nfs-utils-1.3.0/systemd/rpc-statd.service	2015-09-14 11:49:19.547384763 -0400
@@ -2,8 +2,8 @@
 Description=NFS status monitor for NFSv2/3 locking.
 DefaultDependencies=no
 Conflicts=umount.target
-Requires=nss-lookup.target rpcbind.target
-After=network.target nss-lookup.target rpcbind.target
+Requires=nss-lookup.target rpcbind.service
+After=network.target nss-lookup.target rpcbind.service
 
 PartOf=nfs-utils.service