diff --git a/sysutils/atf-master/Makefile b/sysutils/atf-master/Makefile
index 7270fe6ebe6e..0281e3966f2c 100644
--- a/sysutils/atf-master/Makefile
+++ b/sysutils/atf-master/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	atf
 PORTVERSION?=	${ATF_VERSION}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${PLAT}
 
 MAINTAINER=	uboot@FreeBSD.org
 COMMENT=	ARM TF-A for platform ${PLAT}
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS+=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
 
 USES=	gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ARM-software
 GH_PROJECT=	arm-trusted-firmware
 GH_TAGNAME=	${ATF_VERSION}
 
 SSP_UNSAFE=	yes
 MAKE_ENV+=	CROSS_COMPILE="aarch64-none-elf-"
 ATF_TARGET?=	bl31
 ALL_TARGET=	ARCH="aarch64" PLAT=${PLAT} V=1 CFLAGS= HOSTCC=${CC} ${ATF_TARGET}
 
 # Default to the latest release
-ATF_VERSION?=	v2.5
+ATF_VERSION?=	v2.6
 
 PLIST_FILES?=	${PREFIX}/share/${PORTNAME}-${PLAT}/${BL31:T}
 .if defined(FIP)
 PLIST_FILES+=	${PREFIX}/share/${PORTNAME}-${PLAT}/${FIP:T}
 .endif
 
 DESCR?=		${.CURDIR}/pkg-descr
 
 NO_ARCH=	yes
 
 .if !defined(PLAT)
 PLAT=		NONE
 IGNORE=		is a metaport; there is nothing to build
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 .if defined(FIP)
 	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${FIP} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/atf-master/distinfo b/sysutils/atf-master/distinfo
index 87e81a4d6ea9..127e7fed0cb8 100644
--- a/sysutils/atf-master/distinfo
+++ b/sysutils/atf-master/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625655824
-SHA256 (ARM-software-arm-trusted-firmware-v2.5_GH0.tar.gz) = fc4cdac7c08fc398b6d4b705285dc13ac2d2b30a7449c6f07e9ccd81207241df
-SIZE (ARM-software-arm-trusted-firmware-v2.5_GH0.tar.gz) = 5506282
+TIMESTAMP = 1651562836
+SHA256 (ARM-software-arm-trusted-firmware-v2.6_GH0.tar.gz) = 3905a6d6affa84fb629d1565a4e4bdc82812bba49a457b8249ab445eeb28011b
+SIZE (ARM-software-arm-trusted-firmware-v2.6_GH0.tar.gz) = 6007331