diff --git a/sysutils/atf-master/Makefile b/sysutils/atf-master/Makefile
--- a/sysutils/atf-master/Makefile
+++ b/sysutils/atf-master/Makefile
@@ -25,9 +25,9 @@
 # Default to the latest release
 ATF_VERSION?=	v2.10.4
 
-PLIST_FILES?=	${PREFIX}/share/${PORTNAME}-${PLAT}/${BL31:T}
+PLIST_FILES?=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}/${BL31:T}
 .if defined(FIP)
-PLIST_FILES+=	${PREFIX}/share/${PORTNAME}-${PLAT}/${FIP:T}
+PLIST_FILES+=	${PREFIX}/share/${PORTNAME}${PKNAMESUFFIX}/${FIP:T}
 .endif
 
 DESCR?=		${.CURDIR}/pkg-descr
@@ -41,11 +41,17 @@
 IGNORE=		is a metaport; there is nothing to build
 .endif
 
+.if defined(TBOARD)
+PLAT_PATH=	${PLAT}/${TBOARD}
+.else
+PLAT_PATH=	${PLAT}
+.endif
+
 do-install:
-	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
-	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
+	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}/
+	${INSTALL_DATA} ${WRKSRC}/build/${PLAT_PATH}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}/
 .if defined(FIP)
-	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${FIP} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
+	${INSTALL_DATA} ${WRKSRC}/build/${PLAT_PATH}/release/${FIP} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}/
 .endif
 
 .include <bsd.port.mk>