diff --git a/srcpkgs/util-linux/files/uuidd/run b/srcpkgs/util-linux/files/uuidd/run
new file mode 100755
index 00000000000..768b34b1c3e
--- /dev/null
+++ b/srcpkgs/util-linux/files/uuidd/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ ! -d /run/uuidd ] && mkdir -p /run/uuidd
+chown uuidd:uuidd /run/uuidd
+exec chpst -u uuidd:uuidd uuidd -F -P
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 1f4d6e64db1..db0c2c721ac 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux'
 pkgname=util-linux
 version=2.25.1
-revision=2
+revision=3
 short_desc="Miscellaneous linux utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
@@ -13,19 +13,19 @@ hostmakedepends="automake gettext-devel libtool pkg-config"
 makedepends="zlib-devel ncurses-devel pam-devel>=1.1.8_4 libcap-ng-devel"
 # Create uuidd system account for uuidd.
 system_accounts="uuidd"
+uuid_homedir="/var/uuidd"
 conf_files="
 	/etc/pam.d/chfn
 	/etc/pam.d/chsh
 	/etc/pam.d/su
 	/etc/pam.d/su-l
 	/etc/pam.d/login"
-replaces="eject>=0"
+replaces="runit-void<20141013_2 eject>=0"
 provides="eject-${version}_1"
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
-
 do_configure() {
 	./configure ${configure_args} \
 		--exec-prefix=/usr --libdir=/usr/lib \
@@ -55,7 +55,9 @@ do_install() {
 	vinstall $FILESDIR/common.pam 644 etc/pam.d chsh
 
 	# Provide sg(1) symlink.
-	ln -sfr ${DESTDIR}/usr/bin/newgrp ${DESTDIR}/usr/bin/sg
+	ln -sf newgrp ${DESTDIR}/usr/bin/sg
+
+	vsv uuidd
 }
 
 libmount_package() {
@@ -64,7 +66,6 @@ libmount_package() {
 		vmove "usr/lib/libmount.so.*"
 	}
 }
-
 libmount-devel_package() {
 	depends="libblkid-devel-${version}_${revision} libmount-${version}_${revision}"
 	short_desc="mount(8) library development files"
@@ -75,14 +76,12 @@ libmount-devel_package() {
 		vmove usr/include/libmount
 	}
 }
-
 libblkid_package() {
 	short_desc="Library to handle device identification"
 	pkg_install() {
 		vmove "usr/lib/libblkid.so.*"
 	}
 }
-
 libblkid-devel_package() {
 	depends="zlib-devel libuuid-devel-${version}_${revision} libblkid-${version}_${revision}"
 	short_desc="libblkid development files"
@@ -94,14 +93,12 @@ libblkid-devel_package() {
 		vmove usr/share/man/man3/libblkid.3
 	}
 }
-
 libuuid_package() {
 	short_desc="UUID library"
 	pkg_install() {
 		vmove "usr/lib/libuuid.so.*"
 	}
 }
-
 libuuid-devel_package() {
 	depends="libuuid-${version}_${revision}"
 	short_desc="UUID library development files"
@@ -113,7 +110,6 @@ libuuid-devel_package() {
 		vmove usr/share/man/man3/uuid*
 	}
 }
-
 libsmartcols-devel_package() {
 	depends="libsmartcols>=${version}_${revision}"
 	short_desc="Table or Tree library from util-linux - development files"
@@ -124,7 +120,6 @@ libsmartcols-devel_package() {
 		vmove usr/lib/pkgconfig/smartcols*
 	}
 }
-
 libsmartcols_package() {
 	short_desc="Table or Tree library from util-linux"
 	pkg_install() {