diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 824856768f3..9a000d51552 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
 version=0.9.1.95
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-distro=gentoo
@@ -22,11 +22,16 @@ long_desc="
  NetworkManager is _intended_ to replace default routes, obtain IP addresses
  from a DHCP server, and change nameservers whenever it sees fit."
 
-keep_empty_dirs=yes
 systemd_services="${pkgname}.service"
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 subpackages="$pkgname-devel libnm"
 
+# Required dirs at run time.
+make_dirs="
+/etc/${pkgname}/dispatcher.d 0755 0 0
+/etc/${pkgname}/system-connections 0755 0 0
+/var/lib/${pkgname} 0700 0 0"
+
 Add_dependency run glibc
 Add_dependency run libnm
 Add_dependency run libuuid
@@ -60,7 +65,6 @@ Add_dependency full wpa_supplicant
 post_install()
 {
 	# Install config file.
-	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