diff --git a/devel/atf/Makefile b/devel/atf/Makefile
index d1491c4528d8..b97628c2656a 100644
--- a/devel/atf/Makefile
+++ b/devel/atf/Makefile
@@ -1,40 +1,31 @@
 PORTNAME=	atf
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/jmmv/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ \
-		LOCAL/jmmv
 
-MAINTAINER=	jmmv@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	C, C++ and shell libraries to write ATF-compliant test programs
 WWW=		https://github.com/jmmv/atf/
 
 LICENSE=	BSD3CLAUSE
 
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-USES=		libtool
+USES=		autoreconf libtool pathfix
 USE_CXXSTD=	gnu++11
+USE_GITHUB=	yes
+GH_ACCOUNT=	freebsd
+GH_TAGNAME=	55c21b2
 USE_LDCONFIG=	yes
 
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+
 OPTIONS_DEFINE=	DOCS TEST
 OPTIONS_DEFAULT=TEST
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-MAKE_FLAGS+=	atf_pkgconfigdir=${PREFIX}/libdata/pkgconfig
-.if empty(PORT_OPTIONS:MDOCS)
-MAKE_FLAGS+=	doc_DATA=
-.endif
-.if empty(PORT_OPTIONS:MTEST)
-PLIST_SUB+=	TEST="@comment "
-.else
-PLIST_SUB+=	TEST=
-.endif
+DOCS_MAKE_ARGS_OFF=	doc_DATA=
 
-post-install:
-.if empty(PORT_OPTIONS:MTEST)
+post-install-TEST-off:
 	@${RM} -r ${STAGEDIR}${PREFIX}/tests
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/atf/distinfo b/devel/atf/distinfo
index 2c8707be89fb..0e146842670a 100644
--- a/devel/atf/distinfo
+++ b/devel/atf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (atf-0.21.tar.gz) = 92bc64180135eea8fe84c91c9f894e678767764f6dbc8482021d4dde09857505
-SIZE (atf-0.21.tar.gz) = 567791
+TIMESTAMP = 1704164615
+SHA256 (freebsd-atf-0.21-55c21b2_GH0.tar.gz) = cfb4c031ee61a827f6f0aa0b061e263cc6db1292be9eb9f5d54050bfcdee30f5
+SIZE (freebsd-atf-0.21-55c21b2_GH0.tar.gz) = 198322