diff --git a/devel/util-linux/Makefile b/devel/util-linux/Makefile
index 0a681ea14d58..25b5a08b6dd0 100644
--- a/devel/util-linux/Makefile
+++ b/devel/util-linux/Makefile
@@ -1,55 +1,59 @@
 PORTNAME=	util-linux
-DISTVERSION=	2.36
-PORTREVISION=	2
+DISTVERSION=	2.39.1
 CATEGORIES=	devel
-MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${DISTVERSION}/
+MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${DISTVERSION:R}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Random collection of Linux utilities
 WWW=		https://github.com/karelzak/util-linux
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gettext-tools gmake libtool ncurses pkgconfig \
 		shebangfix tar:xz
 
 USE_LDCONFIG=	yes
 
-SHEBANG_FILES=	misc-utils/getopt-parse.bash
+SHEBANG_FILES=	misc-utils/getopt-example.bash \
+		tools/*.sh \
+		tools/git-tp-sync \
+		tools/git-tp-sync-man \
+		tests/run.sh
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --disable-ipcrm --disable-ipcs \
 		--disable-makeinstall-chown --disable-makeinstall-setuid \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 INSTALL_TARGET=	install-strip
 
 CONFLICTS_INSTALL=	heirloom-doctools
 
 OPTIONS_DEFINE=		CAL FLOCK GETOPT HARDLINK UUID
 OPTIONS_SUB=		yes
 
 CAL_DESC=		Install util-linux cal(1)
 CAL_CONFIGURE_ENABLE=	cal
 
 FLOCK_DESC=		Install util-linux flock(1)
 FLOCK_CONFIGURE_ENABLE=	flock
 
 GETOPT_DESC=		Install util-linux getopt(1)
 GETOPT_CONFIGURE_ENABLE=getopt
 
 HARDLINK_DESC=		Install util-linux hardlink(1)
 HARDLINK_CONFIGURE_ENABLE=hardlink
 
 UUID_DESC=		Install libuuid
 UUID_CONFIGURE_ENABLE=	libuuid
 
 post-install: # https://github.com/karelzak/util-linux/issues/1149
 	${RM} -r ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/util-linux/distinfo b/devel/util-linux/distinfo
index 5ec0a554abff..185e50c2ad5f 100644
--- a/devel/util-linux/distinfo
+++ b/devel/util-linux/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606843635
-SHA256 (util-linux-2.36.tar.xz) = 9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
-SIZE (util-linux-2.36.tar.xz) = 5242420
+TIMESTAMP = 1688600983
+SHA256 (util-linux-2.39.1.tar.xz) = 890ae8ff810247bd19e274df76e8371d202cda01ad277681b0ea88eeaa00286b
+SIZE (util-linux-2.39.1.tar.xz) = 8351164