diff --git a/sysutils/atf-master/Makefile b/sysutils/atf-master/Makefile
--- a/sysutils/atf-master/Makefile
+++ b/sysutils/atf-master/Makefile
@@ -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}/
+	${INSTALL_DATA} ${WRKSRC}/build/${PLAT_PATH}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 .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}-${PLAT}/
 .endif
 
 .include <bsd.port.mk>