diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index aead41852ab..641717b3a65 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -1,7 +1,7 @@
 # Template file for 'systemd'
 pkgname=systemd
 version=37
-revision=4
+revision=5
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-distro=other --with-rootdir=
@@ -22,9 +22,8 @@ long_desc="
  It can work as a drop-in replacement for sysvinit."
 
 subpackages="systemd-admin systemd-analyze systemd-gnome-passwd-agent systemd-devel"
-
-keep_empty_dirs=yes
 system_groups="lock"
+
 conf_files="
 /etc/hostname
 /etc/vconsole.conf
@@ -33,6 +32,23 @@ conf_files="
 /etc/systemd/user.conf
 /etc/systemd/systemd-logind.conf"
 
+# Required empty directories at run time.
+make_dirs="
+/usr/lib/modules-load.d 			0755	0	0
+/usr/lib/sysctl.d 				0755	0	0
+/usr/lib/binfmt.d 				0755	0	0
+/usr/libexec/systemd/user-generators 		0755	0	0
+/lib/systemd/system/graphical.target.wants 	0755	0	0
+/lib/systemd/system-shutdown 			0755	0	0
+/etc/systemd/system/sysinit.target.wants 	0755	0	0
+/etc/systemd/system/local-fs.target.wants 	0755	0	0
+/etc/systemd/user 				0755	0	0
+/etc/tmpfiles.d 				0755	0	0
+/etc/modules-load.d 				0755	0	0
+/etc/sysctl.d 					0755	0	0
+/etc/binfmt.d 					0755	0	0
+"
+
 Add_dependency run glibc
 Add_dependency run libudev
 Add_dependency run pam