Index: head/devel/util-linux/Makefile
===================================================================
--- head/devel/util-linux/Makefile	(revision 556888)
+++ head/devel/util-linux/Makefile	(revision 556889)
@@ -1,42 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	util-linux
-DISTVERSIONPREFIX=	v
 DISTVERSION=	2.36
 CATEGORIES=	devel
+MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Random collection of Linux utilities
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		autoreconf gettext gmake libtool ncurses pkgconfig shebangfix
+USES=		autoreconf gettext-tools gmake libtool ncurses pkgconfig \
+		shebangfix tar:xz
 USE_LDCONFIG=	yes
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	karelzak
-
 SHEBANG_FILES=	misc-utils/getopt-parse.bash
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-ipcmk --disable-ipcrm --disable-ipcs --disable-makeinstall-chown --disable-makeinstall-setuid
+CONFIGURE_ARGS=	--disable-nls --disable-ipcrm --disable-ipcs \
+		--disable-makeinstall-chown --disable-makeinstall-setuid
 
 INSTALL_TARGET=	install-strip
 
 CONFLICTS_INSTALL=	cal
 
 OPTIONS_DEFINE=		UUID
 OPTIONS_SUB=		yes
 
 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>
Index: head/devel/util-linux/distinfo
===================================================================
--- head/devel/util-linux/distinfo	(revision 556888)
+++ head/devel/util-linux/distinfo	(revision 556889)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601080727
-SHA256 (karelzak-util-linux-v2.36_GH0.tar.gz) = 5e4a6f73b28aadceab66ec4490bb5fc77861066660f27b5ec605648809205522
-SIZE (karelzak-util-linux-v2.36_GH0.tar.gz) = 7806261
+TIMESTAMP = 1606843635
+SHA256 (util-linux-2.36.tar.xz) = 9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
+SIZE (util-linux-2.36.tar.xz) = 5242420