diff --git a/srcpkgs/libudev/patches b/srcpkgs/libudev/patches
new file mode 120000
index 0000000000..6cd6fe78dd
--- /dev/null
+++ b/srcpkgs/libudev/patches
@@ -0,0 +1 @@
+../systemd/patches
\ No newline at end of file
diff --git a/srcpkgs/libudev/template b/srcpkgs/libudev/template
index 7652f58a97..1538454ec9 100644
--- a/srcpkgs/libudev/template
+++ b/srcpkgs/libudev/template
@@ -1,7 +1,7 @@
 # Template file for 'libudev'
 pkgname=libudev
 version=198
-revision=2
+revision=5
 wrksrc="systemd-${version}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --disable-selinux
diff --git a/srcpkgs/systemd/patches/c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8.patch b/srcpkgs/systemd/patches/c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8.patch
new file mode 100644
index 0000000000..a45ca5fa2c
--- /dev/null
+++ b/srcpkgs/systemd/patches/c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8.patch
@@ -0,0 +1,27 @@
+From c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Thu, 14 Mar 2013 20:36:38 +0000
+Subject: main: don't mount /sys, /dev and friends when we run with PID != 1
+
+Back from old times when we developed systemd on non-systemd hosts we
+still mounted the missing directories such as the cgroup stuff even when
+running with a PID != 1. There's no point for that anymore, so let's
+just do that if we are actually PID 1, and never otherwise.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=62354
+---
+diff --git a/src/core/main.c b/src/core/main.c
+index 7b03983..01a6d41 100644
+--- src/core/main.c
++++ src/core/main.c
+@@ -1437,7 +1437,7 @@ int main(int argc, char *argv[]) {
+ 
+         /* Mount /proc, /sys and friends, so that /proc/cmdline and
+          * /proc/$PID/fd is available. */
+-        if (geteuid() == 0 && !getenv("SYSTEMD_SKIP_API_MOUNTS")) {
++        if (getpid() == 1) {
+                 r = mount_setup(loaded_policy);
+                 if (r < 0)
+                         goto finish;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index 449d46942c..ef24f17345 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -1,7 +1,7 @@
 # Template file for 'systemd'
 pkgname=systemd
 version=198
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib
  --disable-selinux --disable-tcpwrap --with-rootprefix=/usr
@@ -46,9 +46,7 @@ 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
-			PKG_CONFIG_SYSROOT_DIR=/usr/$XBPS_CROSS_TRIPLET
-			PKG_CONFIG_LIBDIR=/usr/$XBPS_CROSS_TRIPLET/lib/pkgconfig"
+			ac_cv_func_realloc_0_nonnull=yes"
 	pre_configure() {
 		autoreconf -fi
 	}