diff --git a/srcpkgs/systemd/INSTALL b/srcpkgs/systemd/INSTALL
index 47637d0198..d7b0c60980 100644
--- a/srcpkgs/systemd/INSTALL
+++ b/srcpkgs/systemd/INSTALL
@@ -2,6 +2,10 @@ case "${ACTION}" in
 post)
 	setcap cap_dac_override,cap_sys_ptrace+ep usr/bin/systemd-detect-virt || :
 
+	if [ -c dev/urandom -a ! -f etc/machine-id ]; then
+		systemd-machine-id-setup
+		systemctl enable getty@.service || :
+	fi
 	if [ "$UPDATE" = "yes" -a -e sys/fs/cgroup/systemd ]; then
 		udevadm hwdb --update
 		journalctl --update-catalog
diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index 78b86ef74b..aa07cf2d60 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -1,7 +1,7 @@
 # Template file for 'systemd'
 pkgname=systemd
 version=197
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib
  --disable-selinux --disable-tcpwrap --with-rootprefix=/usr
@@ -44,7 +44,9 @@ if [ -n "$XBPS_CROSS_TRIPLET" ]; then
 	configure_args="${configure_args} --without-python --disable-gudev
 			--enable-introspection=no
 			ac_cv_func_malloc_0_nonnull=yes
-			ac_cv_func_realloc_0_nonnull=yes"
+			ac_cv_func_realloc_0_nonnull=yes
+			PKG_CONFIG_SYSROOT_DIR=/usr/$XBPS_CROSS_TRIPLET
+			PKG_CONFIG_LIBDIR=/usr/$XBPS_CROSS_TRIPLET/lib/pkgconfig"
 	pre_configure() {
 		autoreconf -fi
 	}
@@ -82,6 +84,9 @@ post_install() {
 	# Remove RPM stuff.
 	rm -rf ${DESTDIR}/etc/rpm
 
+	# Disable units in /etc; we do this at post-install time.
+	rm -rf ${DESTDIR}/etc/systemd/system/getty.target.wants
+
 	# Create /usr/sbin/udev symlink just for compatibility.
 	ln -sf /usr/lib/systemd/systemd-udevd ${DESTDIR}/usr/sbin/udevd