diff --git a/srcpkgs/rfkill/template b/srcpkgs/rfkill/template
deleted file mode 100644
index 7683d2488fe..00000000000
--- a/srcpkgs/rfkill/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'rkill'
-pkgname=rfkill
-version=0.5
-revision=3
-build_style=gnu-makefile
-short_desc="Tool for enabling and disabling wireless devices"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="Public domain"
-homepage="http://wireless.kernel.org/en/users/Documentation/rfkill"
-distfiles="https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$version.tar.bz2"
-checksum=3e160cca504a53679f2b3254f31c53a4fb38a021bc50fed8eb57a436d33dfa07
-make_install_args="SBINDIR=/usr/bin"
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index f67dfc56285..d8a5010387c 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,13 +1,13 @@
 # Template file for 'util-linux'
 pkgname=util-linux
-version=2.30.2
+version=2.31
 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=7b5be5489e9b5b7177832836467aba1c87bf0e9bcbcb5a6f35d76cd4782589dc
+distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version}/${pkgname}-${version}.tar.xz"
+checksum=f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a
 
 hostmakedepends="automake gettext-devel libtool pkg-config bison"
 makedepends="zlib-devel readline-devel pam-devel libcap-ng-devel"
@@ -15,7 +15,8 @@ makedepends="zlib-devel readline-devel pam-devel libcap-ng-devel"
 system_accounts="uuidd"
 uuidd_homedir="/run/uuidd"
 conf_files="/etc/pam.d/*"
-provides="eject-${version}_1"
+provides="eject-${version}_1 rfkill-${version}_1"
+replaces="rfkill>=0"
 
 # XXX musl needs this for switch_root(8).
 CFLAGS="-D_DIRENT_HAVE_D_TYPE"