diff --git a/srcpkgs/systemd/INSTALL b/srcpkgs/systemd/INSTALL
index 7c22ecac50a..9ac7744d5ce 100644
--- a/srcpkgs/systemd/INSTALL
+++ b/srcpkgs/systemd/INSTALL
@@ -1,7 +1,8 @@
 case "${ACTION}" in
 post)
 	if [ -c dev/urandom -a ! -f etc/machine-id ]; then
-		bin/systemd-machine-id-setup
+		systemd-machine-id-setup
+		systemctl enable getty@.service
 	fi
 	;;
 esac
diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index a07eecb60c2..e9cfe535e5f 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -1,7 +1,7 @@
 # Template file for 'systemd'
 pkgname=systemd
 version=191
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-distro=other --libexecdir=/usr/lib
 --disable-selinux --disable-tcpwrap --with-rootprefix=/usr
@@ -40,26 +40,29 @@ conf_files="
 
 system_groups="adm"
 
+# Required empty dirs to be created.
 make_dirs="
+/etc/binfmt.d 0755 root root
+/etc/sysctl.d 0755 root root
+/etc/modules-load.d 0755 root root
+/etc/tmpfiles.d 0755 root root
 /etc/local.d 0755 root root
 /etc/systemd/ntp-units.d 0755 root root
+/etc/systemd/user 0755 root root
+/etc/systemd/system/local-fs.target.wants 0755 root root
+/etc/systemd/system/sysinit.target.wants 0755 root root
+/usr/lib/systemd/system-shutdown 0755 root root
+/usr/lib/systemd/system-sleep 0755 root root
+/usr/lib/systemd/system/graphical.target.wants 0755 root root
+/usr/lib/systemd/user-generators 0755 root root
 /usr/lib/systemd/ntp-units.d 0755 root root
+/usr/lib/binfmt.d 0755 root root
+/usr/lib/sysctl.d 0755 root root
+/usr/lib/modules-load.d 0755 root root
 /var/lib/systemd 0755 root root
 /var/log/journal 0755 root adm"
 
 post_install() {
-	for f in etc/binfmt.d etc/sysctl.d etc/modules-load.d etc/tmpfiles.d \
-		etc/systemd/user etc/systemd/system/local-fs.target.wants \
-		etc/systemd/system/sysinit.target.wants \
-		usr/lib/systemd/system-shutdown \
-		usr/lib/systemd/system/graphical.target.wants \
-		usr/lib/systemd/user-generators \
-		usr/lib/systemd/system-sleep \
-		usr/lib/binfmt.d usr/lib/sysctl.d usr/lib/modules-load.d; do
-		vmkdir ${f}
-		touch ${DESTDIR}/${f}/.owned
-	done
-
 	vinstall ${FILESDIR}/hostname 644 etc
 	vinstall ${FILESDIR}/vconsole.conf 644 etc
 	vinstall ${FILESDIR}/os-release 644 etc
@@ -80,8 +83,6 @@ post_install() {
 
 	# Install and enable local-d.service for multi-user.target by default.
 	vinstall ${FILESDIR}/local-d.service 644 usr/lib/systemd/system
-	ln -sf /usr/lib/systemd/system/local-d.service \
-		${DESTDIR}/etc/systemd/system/multi-user.target.wants/local-d.service
 
 	# Remove RPM stuff.
 	rm -rf ${DESTDIR}/etc/rpm
diff --git a/srcpkgs/systemd/udev.template b/srcpkgs/systemd/udev.template
index b45f843084b..12ea36f78c6 100644
--- a/srcpkgs/systemd/udev.template
+++ b/srcpkgs/systemd/udev.template
@@ -6,6 +6,8 @@ long_desc="
  udev is a daemon which dynamically creates and removes device nodes from
  /dev/, handles hotplug events and loads drivers at boot time."
 
+make_dirs="/etc/udev/rules.d 0755 root root"
+
 do_install() {
 	vmove etc/udev etc
 	vmove usr/bin/udevadm usr/bin