diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index 08f0df19416..a8d2e8ff29d 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -1,12 +1,12 @@
 # Template file for 'systemd'
 pkgname=systemd
 version=186
-revision=1
+revision=2
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--with-distro=other --with-rootprefix=
---with-pamlibdir=/lib/security --disable-selinux --disable-tcpwrap
---with-sysvinit-path= --with-sysvrcd-path= --disable-audit --libexecdir=/lib
+configure_args="--with-distro=other --libexecdir=/usr/lib
+--disable-selinux --disable-tcpwrap --with-rootprefix=/usr
+--with-sysvinit-path= --with-sysvrcd-path= --disable-audit
 --with-usb-ids-path=/usr/share/hwdata/usb.ids
 --with-pci-ids-path=/usr/share/hwdata/pci.ids"
 depends="dbus run-parts kbd>=1.15.3_5 systemd-libs>=$version udev>=$version"
@@ -51,10 +51,10 @@ 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 \
-		lib/systemd/system-shutdown \
-		lib/systemd/system/graphical.target.wants \
-		lib/systemd/user-generators \
-		lib/systemd/system-sleep \
+		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
@@ -71,20 +71,20 @@ post_install() {
 
 	# Create halt, reboot, shutdown, poweroff compat symlinks. Some
 	# applications expect them for "normal" use!
-	vmkdir sbin
+	vmkdir usr/sbin
 	for f in halt poweroff shutdown reboot; do
-		ln -sf /bin/systemctl ${DESTDIR}/sbin/${f}
+		ln -sf /usr/bin/systemctl ${DESTDIR}/usr/sbin/${f}
 	done
 	# Create /sbin/init for compatibility.
-	ln -sf /lib/systemd/systemd ${DESTDIR}/sbin/init
+	ln -sf /usr/lib/systemd/systemd ${DESTDIR}/usr/sbin/init
 
 	# Do not use /sbin/sulogin, sysvinit has been fully removed.
 	for f in console-shell emergency rescue; do
 		sed -i -e "s|/sbin/sulogin|/bin/sh|" \
-			${DESTDIR}/lib/systemd/system/${f}.service
+			${DESTDIR}/usr/lib/systemd/system/${f}.service
 	done
 	# Install and enable local-d.service for multi-user.target by default.
-	vinstall ${FILESDIR}/local-d.service 644 lib/systemd/system
-	ln -sf /lib/systemd/system/local-d.service \
-		${DESTDIR}/lib/systemd/system/multi-user.target.wants/local-d.service
+	vinstall ${FILESDIR}/local-d.service 644 usr/lib/systemd/system
+	ln -sf /usr/lib/systemd/system/local-d.service \
+		${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants/local-d.service
 }
diff --git a/srcpkgs/systemd/udev.template b/srcpkgs/systemd/udev.template
index bbd67097b9b..b45f843084b 100644
--- a/srcpkgs/systemd/udev.template
+++ b/srcpkgs/systemd/udev.template
@@ -9,18 +9,18 @@ long_desc="
 do_install() {
 	vmove etc/udev etc
 	vmove usr/bin/udevadm usr/bin
-	vmove lib/udev lib
+	vmove usr/lib/udev usr/lib
 	vmove usr/share/man/man7/udev.7 usr/share/man/man7
 	for f in udevadm systemd-udevd; do
 		vmove usr/share/man/man8/${f}.8 usr/share/man/man8
 	done
 	vmove usr/share/pkgconfig/udev.pc usr/share/pkgconfig
-	vmove lib/systemd/systemd-udevd lib/systemd
+	vmove usr/lib/systemd/systemd-udevd usr/lib/systemd
 	for f in udevd.service udevd-control.socket udevd-kernel.socket \
 		udev-trigger.service udev-settle.service; do
-		vmove lib/systemd/system/systemd-${f} lib/systemd/system
+		vmove usr/lib/systemd/system/systemd-${f} usr/lib/systemd/system
 	done
-	# Create /sbin/udev symlink just for compatibility.
-	vmkdir sbin
-	ln -sf /lib/systemd/systemd-udevd ${DESTDIR}/sbin/udevd
+	# Create /usr/sbin/udev symlink just for compatibility.
+	vmkdir usr/sbin
+	ln -sf /usr/lib/systemd/systemd-udevd ${DESTDIR}/usr/sbin/udevd
 }