diff --git a/sysutils/shuf/Makefile b/sysutils/shuf/Makefile
--- a/sysutils/shuf/Makefile
+++ b/sysutils/shuf/Makefile
@@ -1,21 +1,25 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
 
 PORTNAME=	shuf
-PORTVERSION=	1.8
+DISTVERSIONPREFIX=	${PORTNAME}-
+DISTVERSION=	3.0
 CATEGORIES=	sysutils
-MASTER_SITES=	LOCAL/swills
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Randomly permute input lines
 
 LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	ibara
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/shuf man/man1/shuf.1.gz
+PLIST_FILES=	bin/shuf \
+		share/man/man1/shuf.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/shuf ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/shuf.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/shuf.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/shuf/distinfo b/sysutils/shuf/distinfo
--- a/sysutils/shuf/distinfo
+++ b/sysutils/shuf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525186596
-SHA256 (shuf-1.8.tar.gz) = 9135103942e23b1d0e023364a11b4b150cb7965b56ed0fb168fcadbfeef7c503
-SIZE (shuf-1.8.tar.gz) = 5569
+TIMESTAMP = 1618663228
+SHA256 (ibara-shuf-shuf-3.0_GH0.tar.gz) = c147250700bdc689dbee24c5b3076763c2f26c6474c0822abe5b6012a42aa1ab
+SIZE (ibara-shuf-shuf-3.0_GH0.tar.gz) = 6162
diff --git a/sysutils/shuf/pkg-descr b/sysutils/shuf/pkg-descr
--- a/sysutils/shuf/pkg-descr
+++ b/sysutils/shuf/pkg-descr
@@ -1,3 +1,6 @@
 shuf is a utility that outputs a random permutation of its input lines.
 
-WWW: https://devio.us/~bcallah/shuf/
+It is an ISC licensed reimplementation of the shuf(1) utility
+from GNU coreutils.
+
+WWW: https://github.com/ibara/shuf