diff --git a/nfs-blkmap.service b/nfs-blkmap.service
index 7897bb2..c026492 100644
--- a/nfs-blkmap.service
+++ b/nfs-blkmap.service
@@ -10,4 +10,4 @@ EnvironmentFile=-/etc/sysconfig/nfs
 ExecStart=/usr/sbin/blkmapd $BLKMAPDARGS
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=nfs.target
diff --git a/nfs-lock.service b/nfs-lock.service
index f9b6fac..2a66772 100644
--- a/nfs-lock.service
+++ b/nfs-lock.service
@@ -14,4 +14,4 @@ ExecStart=/sbin/rpc.statd $STATDARG
 ExecStopPost=-/sbin/sysctl -w fs.nfs.nlm_tcpport=0 fs.nfs.nlm_udpport=0
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=nfs.target
diff --git a/nfs-secure-server.service b/nfs-secure-server.service
index cd64cb3..1b9c0f4 100644
--- a/nfs-secure-server.service
+++ b/nfs-secure-server.service
@@ -10,5 +10,5 @@ EnvironmentFile=-/etc/sysconfig/nfs
 ExecStart=/usr/sbin/rpc.svcgssd $RPCSVCGSSDARGS
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=nfs.target
 
diff --git a/nfs-secure.service b/nfs-secure.service
index c5a652e..32a33ea 100644
--- a/nfs-secure.service
+++ b/nfs-secure.service
@@ -10,4 +10,4 @@ EnvironmentFile=-/etc/sysconfig/nfs
 ExecStart=/usr/sbin/rpc.gssd $RPCGSSDARGS
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=nfs.target
diff --git a/nfs-server.service b/nfs-server.service
index 4cc8c27..41a7b48 100644
--- a/nfs-server.service
+++ b/nfs-server.service
@@ -17,5 +17,5 @@ ExecStop=/usr/sbin/rpc.nfsd 0
 ExecStopPost=/usr/sbin/exportfs -f
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=nfs.target
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 0b9632b..820c06a 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.8
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -298,6 +298,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue May  7 2013 Steve Dickson <steved@redhat.com> 1.2.8-1.1
+  systemd: nfs-server.service needs to be split up (bz 769879)
+
 * Tue May  7 2013 Steve Dickson <steved@redhat.com> 1.2.8-1
 - Updated to the latest upstream RC release: nfs-utils.1.2.9-rc1