diff --git a/nfs-idmap.service b/nfs-idmap.service
index d8be179..872ae09 100644
--- a/nfs-idmap.service
+++ b/nfs-idmap.service
@@ -2,7 +2,6 @@
 Description=NFSv4 ID-name mapping daemon
 BindTo=nfs-server.service
 After=nfs-server.service
-Names=rpcidmapd.service
 
 [Service]
 Type=forking
diff --git a/nfs-lock.service b/nfs-lock.service
index 623369e..f9b6fac 100644
--- a/nfs-lock.service
+++ b/nfs-lock.service
@@ -3,7 +3,6 @@ Description=NFS file locking service.
 Requires=rpcbind.service network.target
 After=network.target named.service rpcbind.service
 Before=remote-fs-pre.target
-Names=nfslock.service
 
 [Service]
 Type=forking
diff --git a/nfs-secure-server.service b/nfs-secure-server.service
index b58a6c5..cd64cb3 100644
--- a/nfs-secure-server.service
+++ b/nfs-secure-server.service
@@ -2,7 +2,6 @@
 Description=Secure NFS Server
 Requires=var-lib-nfs-rpc_pipefs.mount nfs-server.service
 After=syslog.target var-lib-nfs-rpc_pipefs.mount nfs-server.service 
-Names=rpcsvcgssd.service
 
 [Service]
 Type=forking
diff --git a/nfs-secure.service b/nfs-secure.service
index d9192f1..c5a652e 100644
--- a/nfs-secure.service
+++ b/nfs-secure.service
@@ -2,7 +2,6 @@
 Description=Secure NFS
 Requires=var-lib-nfs-rpc_pipefs.mount
 After=syslog.target var-lib-nfs-rpc_pipefs.mount
-Names=rpcgssd.service
 
 [Service]
 Type=forking
diff --git a/nfs-server.service b/nfs-server.service
index e4078fc..95ade87 100644
--- a/nfs-server.service
+++ b/nfs-server.service
@@ -3,7 +3,6 @@ Description=NFS Server
 Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service
 Requires=nfs-idmap.service nfs-mountd.service nfs-rquotad.service
 After=network.target named.service
-Names=nfs.service
 
 [Service]
 Type=oneshot
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 6604290..58e4016 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.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -154,6 +154,13 @@ for config in %{nfs_configs} ; do
 	install -m 755 $config $RPM_BUILD_ROOT/usr/lib/%{name}/scripts
 done
 
+cd $RPM_BUILD_ROOT/lib/systemd/system
+ln -s nfs-idmap.service rpcidmapd.service
+ln -s nfs-lock.service nfslock.service
+ln -s nfs-secure-server.service rpcsvcgssd.service
+ln -s nfs-secure.service rpcgssd.service
+ln -s nfs-server.service nfs.service
+
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/rpc_pipefs
 
 touch $RPM_BUILD_ROOT/var/lib/nfs/rmtab
@@ -298,6 +305,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Fri Jun 22 2012 Steve Dickson <steved@redhat.com> 1.2.6-7
+- Reworked how the legacy names are enabled in systemd
+
 * Tue Jun 12 2012 Steve Dickson <steved@redhat.com> 1.2.6-6
 - Updated to latest upstream RC release: nfs-utils.1.2.7-rc2 (bz 833555)