diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index 8430d5e3cbd9..4faefc3bcff9 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -170,9 +170,9 @@ UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}}
 
 # Per family dependancies
 .if defined(FAMILY) && ${FAMILY} == allwinner64
-.if defined(SUBFAMILY) && ${SUBFAMILY} == h6
-BUILD_DEPENDS+=	${LOCALBASE}/share/atf-sun50i_h6/bl31.bin:sysutils/atf-sun50i_h6
-MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-sun50i_h6/bl31.bin
+.if defined(SUBFAMILY)
+BUILD_DEPENDS+=	${LOCALBASE}/share/atf-sun50i_${SUBFAMILY}/bl31.bin:sysutils/atf-sun50i_${SUBFAMILY}
+MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-sun50i_${SUBFAMILY}/bl31.bin
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/atf-sun50i_a64/bl31.bin:sysutils/atf-sun50i_a64
 MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-sun50i_a64/bl31.bin
diff --git a/sysutils/atf-sun50i_h616/Makefile b/sysutils/atf-sun50i_h616/Makefile
new file mode 100644
index 000000000000..619b519c4cce
--- /dev/null
+++ b/sysutils/atf-sun50i_h616/Makefile
@@ -0,0 +1,7 @@
+WWW=		https://github.com/ARM-software/arm-trusted-firmware
+MASTERDIR=	${.CURDIR}/../atf-master
+
+PLAT=	sun50i_h616
+BL31=	bl31.bin
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/atf-sun50i_h616/pkg-descr b/sysutils/atf-sun50i_h616/pkg-descr
new file mode 100644
index 000000000000..e63f72652ddd
--- /dev/null
+++ b/sysutils/atf-sun50i_h616/pkg-descr
@@ -0,0 +1,5 @@
+Arm Trusted Framework for Allwinner H616 SoCs
+
+Trusted Firmware-A (TF-A) provides a reference implementation of secure world
+software for Armv7-A and Armv8-A, including a Secure Monitor executing at
+Exception Level 3 (EL3).
diff --git a/sysutils/u-boot-orangepi-zero-2w/Makefile b/sysutils/u-boot-orangepi-zero-2w/Makefile
new file mode 100644
index 000000000000..223ca12c3120
--- /dev/null
+++ b/sysutils/u-boot-orangepi-zero-2w/Makefile
@@ -0,0 +1,8 @@
+MASTERDIR=	${.CURDIR}/../u-boot-master
+
+MODEL=		orangepi-zero-2w
+BOARD_CONFIG=	orangepi_zero2w_defconfig
+FAMILY=		allwinner64
+SUBFAMILY=	h616
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-zero-2w/pkg-descr b/sysutils/u-boot-orangepi-zero-2w/pkg-descr
new file mode 100644
index 000000000000..9f77b0fa408b
--- /dev/null
+++ b/sysutils/u-boot-orangepi-zero-2w/pkg-descr
@@ -0,0 +1,11 @@
+U-Boot loader for OrangePi Zero 2W.
+
+To install this bootloader on an sdcard just do :
+dd if=$LOCALBASE/share/u-boot/u-boot-orangepi-zero-2w/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+
+This version is patched so that:
+ * API features are enabled.
+ * A boot.scr (U-Boot script) that loads ubldr.bin and execute it is included
+
+For information about running FreeBSD on Allwinner boards, see
+https://wiki.freebsd.org/FreeBSD/arm/Allwinner