diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index aa2c0714831..dce5e8d8bee 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
 version=0.9.1.90
-revision=2
+revision=3
 distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--localstatedir=/var --with-distro=gentoo
@@ -23,8 +23,8 @@ long_desc="
  from a DHCP server, and change nameservers whenever it sees fit."
 
 keep_empty_dirs=yes
-openrc_services="NetworkManager default true"
-conf_files="/etc/NetworkManager/NetworkManager.conf"
+systemd_services="${pkgname}.service"
+conf_files="/etc/${pkgname}/${pkgname}.conf"
 subpackages="$pkgname-devel libnm"
 
 Add_dependency run glibc
@@ -63,4 +63,5 @@ post_install()
 	install -d ${DESTDIR}/etc/NetworkManager/dispatcher.d
 	install -m644 ${FILESDIR}/*.conf ${DESTDIR}/etc/NetworkManager
 	rm -rf ${DESTDIR}/var/run
+	rm -rf ${DESTDIR}/etc/init.d
 }