diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 213325e487f..08a4cec3bb9 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.33
-revision=1
+revision=2
 hostmakedepends="automake bison gettext-devel libtool pkg-config"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
 checkdepends="ncurses" # Some tests require terminfo-entries
@@ -14,7 +14,7 @@ checksum=f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"
-_uuidd_homedir="/run/uuidd"
+_uuidd_homedir="/var/empty"
 conf_files="/etc/pam.d/*"
 provides="eject-${version}_1 rfkill-${version}_1"
 replaces="rfkill>=0"
@@ -67,14 +67,14 @@ do_install() {
 }
 
 libfdisk_package() {
-	short_desc="A fdisk(8) library"
+	short_desc="Library for fdisk(8)"
 	pkg_install() {
 		vmove "usr/lib/libfdisk.so.*"
 	}
 }
 libfdisk-devel_package() {
 	depends="libblkid-devel-${version}_${revision} libfdisk-${version}_${revision}"
-	short_desc="fdisk(8) library development files"
+	short_desc="Library for fdisk(8) - development files"
 	pkg_install() {
 		vmove usr/lib/libfdisk.a
 		vmove usr/lib/libfdisk.so
@@ -83,14 +83,14 @@ libfdisk-devel_package() {
 	}
 }
 libmount_package() {
-	short_desc="A mount(8) library"
+	short_desc="Library for mount(8)"
 	pkg_install() {
 		vmove "usr/lib/libmount.so.*"
 	}
 }
 libmount-devel_package() {
 	depends="libblkid-devel-${version}_${revision} libmount-${version}_${revision}"
-	short_desc="mount(8) library development files"
+	short_desc="Library for mount(8) - development files"
 	pkg_install() {
 		vmove usr/lib/libmount.a
 		vmove usr/lib/libmount.so
@@ -106,7 +106,7 @@ libblkid_package() {
 }
 libblkid-devel_package() {
 	depends="zlib-devel libuuid-devel-${version}_${revision} libblkid-${version}_${revision}"
-	short_desc="libblkid development files"
+	short_desc="Library to handle device identification - development files"
 	pkg_install() {
 		vmove usr/include/blkid
 		vmove usr/lib/libblkid.a