diff --git a/srcpkgs/util-linux/patches/fix-musl-2.patch b/srcpkgs/util-linux/patches/fix-musl-2.patch
deleted file mode 100644
index 2786f617c41..00000000000
--- a/srcpkgs/util-linux/patches/fix-musl-2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fixes rendering issue with chsh
-
---- login-utils/chsh.c.orig	2015-08-01 23:56:41.281133707 +0200
-+++ login-utils/chsh.c	2015-08-01 23:56:52.116132896 +0200
-@@ -179,6 +179,7 @@ static char *ask_new_shell(char *questio
- 	if (!oldshell)
- 		oldshell = "";
- 	printf("%s [%s]: ", question, oldshell);
-+	fflush(stdout);
- 	sz = getline(&ans, &dummy, stdin);
- 	if (sz == -1)
- 		return NULL;
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index b1cd9c5f893..dfeba50b845 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,25 +1,20 @@
 # Template file for 'util-linux'
 pkgname=util-linux
-version=2.29.2
+version=2.30
 revision=1
 short_desc="Miscellaneous linux utilities"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 license="GPL-2"
-distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3
+distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version}/${pkgname}-${version}.tar.xz"
+checksum=c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d
 
-hostmakedepends="automake gettext-devel libtool pkg-config"
+hostmakedepends="automake gettext-devel libtool pkg-config bison"
 makedepends="zlib-devel readline-devel pam-devel libcap-ng-devel"
 # Create uuidd system account for uuidd.
 system_accounts="uuidd"
 uuidd_homedir="/run/uuidd"
-conf_files="
-	/etc/pam.d/chfn
-	/etc/pam.d/chsh
-	/etc/pam.d/su
-	/etc/pam.d/su-l
-	/etc/pam.d/login"
+conf_files="/etc/pam.d/*"
 provides="eject-${version}_1"
 
 # XXX musl needs this for switch_root(8).