diff --git a/srcpkgs/NetworkManager/files/NetworkManager.tmpfiles.d b/srcpkgs/NetworkManager/files/NetworkManager.tmpfiles.d
new file mode 100644
index 00000000000..8b8aa66ace0
--- /dev/null
+++ b/srcpkgs/NetworkManager/files/NetworkManager.tmpfiles.d
@@ -0,0 +1,3 @@
+d	/etc/NetworkManager/dispatcher.d	0755	root	root	-
+d	/etc/NetworkManager/system-connections	0755	root	root	-
+d	/var/lib/NetworkManager			0700	root	root	-
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 202b579f62c..d47267a798d 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -8,7 +8,7 @@ configure_args="--with-distro=gentoo
 --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
 --with-crypto=nss --disable-static --enable-ppp
 --with-systemdsystemunitdir=/lib/systemd/system"
-revision=1
+revision=2
 short_desc="Network Management daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/NetworkManager/"
@@ -26,13 +26,6 @@ systemd_services="${pkgname}.service on"
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 subpackages="$pkgname-devel libnm"
 
-# Required dirs at run time.
-make_dirs="
-/etc/${pkgname}/dispatcher.d 		0755 root root
-/etc/${pkgname}/system-connections 	0755 root root
-/var/lib/${pkgname} 			0700 root root"
-
-
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build libuuid-devel
@@ -45,15 +38,15 @@ Add_dependency build polkit-devel
 Add_dependency build ppp-devel
 Add_dependency build iptables-devel
 
-Add_dependency full dnsmasq
 Add_dependency full dbus		">=0"
 Add_dependency full iproute2
 Add_dependency full dhcpcd
 Add_dependency full wpa_supplicant
 
-post_install()
-{
+post_install() {
 	# Install config file.
-	install -m644 ${FILESDIR}/*.conf ${DESTDIR}/etc/NetworkManager
+	vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
+	vinstall ${FILESDIR}/${pkgname}.tmpfiles.d 644 \
+		usr/lib/tmpfiles.d ${pkgname}.conf
 	rm -rf ${DESTDIR}/etc/init.d
 }