diff --git a/devel/atf/Makefile b/devel/atf/Makefile
index e3a4bd3b152e..2489ed165d9d 100644
--- a/devel/atf/Makefile
+++ b/devel/atf/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	atf
-PORTVERSION=	0.21
-PORTREVISION=	4
+DISTVERSION=	0.22
 CATEGORIES=	devel
+MASTER_SITES=	https://github.com/freebsd/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	C, C++ and shell libraries to write ATF-compliant test programs
 WWW=		https://github.com/freebsd/atf
 
 LICENSE=	BSD3CLAUSE
 
 USES=		autoreconf libtool pathfix
 USE_CXXSTD=	gnu++11
-USE_GITHUB=	yes
-GH_ACCOUNT=	freebsd
-GH_TAGNAME=	511d921
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+
 INSTALL_TARGET=	install-strip
 
+NO_WRKSUBDIR=	yes
+
 OPTIONS_DEFINE=	DOCS TEST
 OPTIONS_DEFAULT=TEST
 OPTIONS_SUB=	yes
 
 DOCS_MAKE_ARGS_OFF=	doc_DATA=
 
 post-install-TEST-off:
 	@${RM} -r ${STAGEDIR}${PREFIX}/tests
 
 .include <bsd.port.mk>
diff --git a/devel/atf/distinfo b/devel/atf/distinfo
index b32f9ac958ee..380aeb43cfe0 100644
--- a/devel/atf/distinfo
+++ b/devel/atf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732441833
-SHA256 (freebsd-atf-0.21-511d921_GH0.tar.gz) = 8351566535cbdc4c136b1255d265f1874be72959df3e3e5c822d035ca2f32dbc
-SIZE (freebsd-atf-0.21-511d921_GH0.tar.gz) = 196633
+TIMESTAMP = 1732981011
+SHA256 (atf-0.22.tar.gz) = e186c079b5140e894bcb6936a08db4f4bbcb816c8497a7e8d7d34344b4ee1b63
+SIZE (atf-0.22.tar.gz) = 5467648