diff --git a/util-linux/.footprint b/util-linux/.footprint
index ad4212b4..244dc7d9 100644
--- a/util-linux/.footprint
+++ b/util-linux/.footprint
@@ -10,8 +10,6 @@ drwxr-xr-x	root/root	bin/
 -rwxr-xr-x	root/root	bin/pipesz
 -rwsr-xr-x	root/root	bin/umount
 -rwxr-xr-x	root/root	bin/wdctl
-drwxr-xr-x	root/root	etc/
--rw-r--r--	root/root	etc/adjtime (EMPTY)
 drwxr-xr-x	root/root	lib/
 lrwxrwxrwx	root/root	lib/libblkid.so.1 -> libblkid.so.1.1.0
 -rwxr-xr-x	root/root	lib/libblkid.so.1.1.0
@@ -26,7 +24,6 @@ lrwxrwxrwx	root/root	lib/libsmartcols.so.1 -> libsmartcols.so.1.1.0
 lrwxrwxrwx	root/root	lib/libuuid.so.1 -> libuuid.so.1.3.0
 -rwxr-xr-x	root/root	lib/libuuid.so.1.3.0
 drwxr-xr-x	root/root	lib/security/
--rwxr-xr-x	root/root	lib/security/pam_lastlog2.la
 -rwxr-xr-x	root/root	lib/security/pam_lastlog2.so
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/agetty
@@ -55,6 +52,7 @@ drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/swapoff
 -rwxr-xr-x	root/root	sbin/swapon
 -rwxr-xr-x	root/root	sbin/switch_root
+-rwxr-xr-x	root/root	sbin/tunelp
 -rwxr-xr-x	root/root	sbin/wipefs
 -rwxr-xr-x	root/root	sbin/zramctl
 drwxr-xr-x	root/root	usr/
@@ -87,6 +85,7 @@ lrwxrwxrwx	root/root	usr/bin/i386 -> setarch
 -rwxr-xr-x	root/root	usr/bin/last
 lrwxrwxrwx	root/root	usr/bin/lastb -> last
 -rwxr-xr-x	root/root	usr/bin/lastlog2
+-rwxr-xr-x	root/root	usr/bin/line
 lrwxrwxrwx	root/root	usr/bin/linux32 -> setarch
 lrwxrwxrwx	root/root	usr/bin/linux64 -> setarch
 -rwxr-xr-x	root/root	usr/bin/logger
@@ -103,6 +102,7 @@ lrwxrwxrwx	root/root	usr/bin/linux64 -> setarch
 -rwxr-xr-x	root/root	usr/bin/mesg
 -rwxr-xr-x	root/root	usr/bin/namei
 -rwxr-xr-x	root/root	usr/bin/nsenter
+-rwxr-xr-x	root/root	usr/bin/pg
 -rwxr-xr-x	root/root	usr/bin/prlimit
 -rwxr-xr-x	root/root	usr/bin/rename
 -rwxr-xr-x	root/root	usr/bin/renice
@@ -142,23 +142,15 @@ drwxr-xr-x	root/root	usr/include/uuid/
 -rw-r--r--	root/root	usr/include/uuid/uuid.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libblkid.a
--rwxr-xr-x	root/root	usr/lib/libblkid.la
-lrwxrwxrwx	root/root	usr/lib/libblkid.so -> ../../lib/libblkid.so.1.1.0
--rw-r--r--	root/root	usr/lib/libfdisk.a
--rwxr-xr-x	root/root	usr/lib/libfdisk.la
-lrwxrwxrwx	root/root	usr/lib/libfdisk.so -> ../../lib/libfdisk.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib/libblkid.so -> ../../lib/libblkid.so.1
+lrwxrwxrwx	root/root	usr/lib/libfdisk.so -> ../../lib/libfdisk.so.1
 -rw-r--r--	root/root	usr/lib/liblastlog2.a
--rwxr-xr-x	root/root	usr/lib/liblastlog2.la
-lrwxrwxrwx	root/root	usr/lib/liblastlog2.so -> ../../lib/liblastlog2.so.2.0.0
--rw-r--r--	root/root	usr/lib/libmount.a
--rwxr-xr-x	root/root	usr/lib/libmount.la
-lrwxrwxrwx	root/root	usr/lib/libmount.so -> ../../lib/libmount.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib/liblastlog2.so -> ../../lib/liblastlog2.so.2
+lrwxrwxrwx	root/root	usr/lib/libmount.so -> ../../lib/libmount.so.1
 -rw-r--r--	root/root	usr/lib/libsmartcols.a
--rwxr-xr-x	root/root	usr/lib/libsmartcols.la
-lrwxrwxrwx	root/root	usr/lib/libsmartcols.so -> ../../lib/libsmartcols.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib/libsmartcols.so -> ../../lib/libsmartcols.so.1
 -rw-r--r--	root/root	usr/lib/libuuid.a
--rwxr-xr-x	root/root	usr/lib/libuuid.la
-lrwxrwxrwx	root/root	usr/lib/libuuid.so -> ../../lib/libuuid.so.1.3.0
+lrwxrwxrwx	root/root	usr/lib/libuuid.so -> ../../lib/libuuid.so.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/blkid.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/fdisk.pc
@@ -166,6 +158,13 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/mount.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/smartcols.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/uuid.pc
+drwxr-xr-x	root/root	usr/lib/python3.10/
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/libmount/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/libmount/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/libmount/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/libmount/__pycache__/__init__.cpython-310.pyc
+-rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/libmount/pylibmount.cpython-310-x86_64-linux-gnu.so
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/addpart
 -rwxr-xr-x	root/root	usr/sbin/delpart
@@ -205,6 +204,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/kill.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/last.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/lastb.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/line.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/logger.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/look.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/lsclocks.1.gz
@@ -220,15 +220,18 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/mountpoint.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/namei.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nsenter.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pg.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/pipesz.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/prlimit.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/rename.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/renice.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/rev.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/runuser.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/script.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/scriptlive.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/scriptreplay.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/setpgid.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/setpriv.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/setsid.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/setterm.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/taskset.1.gz
@@ -242,31 +245,10 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/wall.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/whereis.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/write.1.gz
-drwxr-xr-x	root/root	usr/share/man/man3/
--rw-r--r--	root/root	usr/share/man/man3/lastlog2.3.gz
--rw-r--r--	root/root	usr/share/man/man3/libblkid.3.gz
--rw-r--r--	root/root	usr/share/man/man3/ll2_import_lastlog.3.gz
--rw-r--r--	root/root	usr/share/man/man3/ll2_read_all.3.gz
--rw-r--r--	root/root	usr/share/man/man3/ll2_read_entry.3.gz
--rw-r--r--	root/root	usr/share/man/man3/ll2_remove_entry.3.gz
--rw-r--r--	root/root	usr/share/man/man3/ll2_rename_user.3.gz
--rw-r--r--	root/root	usr/share/man/man3/ll2_update_login_time.3.gz
--rw-r--r--	root/root	usr/share/man/man3/ll2_write_entry.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid_clear.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid_compare.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid_copy.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid_generate.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid_generate_random.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid_generate_time.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid_generate_time_safe.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid_is_null.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid_parse.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid_time.3.gz
--rw-r--r--	root/root	usr/share/man/man3/uuid_unparse.3.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/adjtime_config.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/fstab.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/low-probe-udf-hdd-udfclient-0.7.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/scols-filter.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/terminal-colors.d.5.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
@@ -282,11 +264,13 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/chmem.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ctrlaltdel.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/delpart.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/fdformat.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/fdisk.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/findfs.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/findmnt.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/fsck.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/fsck.cramfs.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/fsck.minix.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/fsfreeze.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/fstrim.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/hwclock.8.gz
@@ -298,12 +282,15 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/lslocks.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/lsns.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/mkfs.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/mkfs.bfs.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/mkfs.cramfs.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/mkfs.minix.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/mkswap.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/mount.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/pam_lastlog2.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/partx.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/pivot_root.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/raw.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/readprofile.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/resizepart.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/rfkill.8.gz
@@ -314,6 +301,7 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/swapoff.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/swapon.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/switch_root.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/tunelp.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/umount.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/uuidd.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/wdctl.8.gz
@@ -321,4 +309,4 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/zramctl.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
-drwxr-xr-x	root/root	var/lib/libuuid/
+drwxr-xr-x	root/root	var/lib/lastlog/
diff --git a/util-linux/.signature b/util-linux/.signature
index 97163f84..8281532f 100644
--- a/util-linux/.signature
+++ b/util-linux/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqhhcYV8Mj1epcbiJjojx8Wyszpq10F9NAvur29htW9LGX2MykBuQJtFsSnn7ZCN1heoSfCojrb/5zwaopWcJrQ4=
-SHA256 (Pkgfile) = 21dddb72c212746841544407b3865eeb243be86d9c026c7c82c335e3ff191f6e
-SHA256 (.footprint) = 3847de47444494a7817db23a570db60e78a1904eca16bd867dc320a4d15c7e83
-SHA256 (util-linux-2.40.tar.xz) = d57a626081f9ead02fa44c63a6af162ec19c58f53e993f206ab7c3a6641c2cd7
-SHA256 (pam_lastlog2.patch) = 638dd140a0643730d43ed693bbe58e53881eb8e1117d1d8e0bfae765c758be4b
+RWRJc1FUaeVeqnik6JPP6ieUn6PdtABQwYQoQZRSdlEwRrdachLfrxT+TNKd/7PTIfyzIcJSGBB20qtUiWKMuL/J0fH5WZ86LQI=
+SHA256 (Pkgfile) = feeb65843deb8507ad11b470e8c5b5ac10e8b3eee2130e01883774044745cf7e
+SHA256 (.footprint) = 82d4a87081e972e8e9918f25890577cd61f5e81d01ccec9d90a14663fc6a38e7
+SHA256 (util-linux-2.40.1.tar.xz) = 59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f
diff --git a/util-linux/Pkgfile b/util-linux/Pkgfile
index 73c92b82..89593b14 100644
--- a/util-linux/Pkgfile
+++ b/util-linux/Pkgfile
@@ -1,36 +1,66 @@
 # Description: Miscellaneous system utilities
 # URL: https://github.com/karelzak/util-linux
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Depends on: bzip2 eudev file readline xz linux-pam sqlite3
+# Depends on: bzip2 eudev file linux-pam readline sqlite3 xz
 
 name=util-linux
-version=2.40
-release=2
-source=(https://www.kernel.org/pub/linux/utils/$name/v${version:0:4}/$name-$version.tar.xz
-	pam_lastlog2.patch)
+version=2.40.1
+release=1
+#source=(https://github.com/util-linux/util-linux/archive/refs/tags/v$version/$name-$version.tar.gz)
+source=(https://www.kernel.org/pub/linux/utils/$name/v${version:0:4}/$name-$version.tar.xz)
 
 build() {
-	cd $name-$version
 
-	patch -p1 -i $SRC/pam_lastlog2.patch
-
-	./configure \
+	meson setup $name-$version build \
 		--prefix=/usr \
-		--enable-{write,kill} \
-		--disable-nls \
-		--disable-asciidoc \
-		--disable-{login,su,sulogin,nologin,runuser,raw} \
-		--disable-chfn-chsh \
-		--without-python
+		--bindir=/usr/bin \
+		--sbindir=/sbin \
+		--libdir=/lib \
+		--buildtype=plain \
+		--wrap-mode=nodownload \
+		-D b_lto=false \
+		-D b_pie=true \
+		-D nls=disabled \
+		-D pamlibdir=/lib/security \
+		-D cryptsetup=disabled \
+		-D build-chfn-chsh=disabled \
+		-D build-login=disabled \
+		-D build-su=disabled \
+		-D build-sulogin=disabled \
+		-D build-nologin=disabled \
+		-D build-runuser=disabled \
+		-D build-vipw=disabled \
+		-D build-raw=disabled \
+		-D build-newgrp=disabled \
+		-D build-bfs=disabled \
+		-D build-minix=disabled
 
-	make
-	make DESTDIR=$PKG install
 
-	install -d $PKG/{etc,var/lib/libuuid}
-	touch $PKG/etc/adjtime
+	meson compile -C build -j ${JOBS:-1}
+	DESTDIR=$PKG meson install -C build
 
-	prt-get isinst bash-completion || rm -r $PKG/usr/share/bash-completion
-	rm -r $PKG/usr/share/doc
-	rm $PKG/sbin/{mkfs.bfs,mkfs.minix,fsck.minix}
-	rm $PKG/usr/share/man/man8/{fsck.minix,mkfs.bfs,mkfs.minix}.8
+	rm -r $PKG/usr/share/{doc,locale}
+
+	install -d $PKG/{bin,usr/sbin,usr/lib,var/lib/lastlog}
+
+	mv $PKG/usr/bin/{dmesg,findmnt,kill,lsblk,lsfd,more} $PKG/bin
+	mv $PKG/usr/bin/{mount,mountpoint,pipesz,umount,wdctl} $PKG/bin
+	mv $PKG/sbin/{addpart,delpart,ldattach,partx,readprofile} $PKG/usr/sbin
+	mv $PKG/sbin/{resizepart,rfkill,rtcwake,uuidd} $PKG/usr/sbin
+
+	mv $PKG/lib/pkgconfig $PKG/usr/lib
+
+	install -d $PKG/usr/share/man/{man1,man5,man8}
+	find $name-$version -type f -name '*.1' -exec cp -t $PKG/usr/share/man/man1 '{}' + ;
+	find $name-$version -type f -name '*.5' -exec cp -t $PKG/usr/share/man/man5 '{}' + ;
+	find $name-$version -type f -name '*.8' -exec cp -t $PKG/usr/share/man/man8 '{}' + ;
+	rm $PKG/usr/share/man/man1/{chfn,chsh,login,newgrp,su}.1
+	rm $PKG/usr/share/man/man8/{nologin,sulogin,vigr,vipw}.8
+
+	mv $PKG/lib/*.a $PKG/usr/lib
+	cd $PKG/lib
+	local LIB
+	for LIB in lib*.so; do
+		ln -s ../../lib/$(readlink $LIB) $PKG/usr/lib/$LIB && rm $LIB
+	done
 }