diff --git a/boards.csv b/boards.csv
index 59b4c01..1b06f86 100644
--- a/boards.csv
+++ b/boards.csv
@@ -108,6 +108,8 @@ pine_h64,Pine H64,Pine64,allwinner-h6,pine_h64_defconfig,aarch64-linux-gnu,sun50
 
 orange_pi_zero2,Orange Pi Zero2,Xunlong,allwinner-h616,orangepi_zero2_defconfig,aarch64-linux-gnu,sun50i-h616-orangepi-zero2
 
+orange_pi_zero3,Orange Pi Zero 3,Xunlong,allwinner-h618,orangepi_zero3_defconfig,aarch64-linux-gnu,sun50i-h618-orangepi-zero3
+
 semitime_g2,G2 (MK802+),Semitime,allwinner-a10s,mk802_a10s_defconfig,arm-linux-gnueabihf,sun5i-a10s-mk802
 a10s_olinuxino_micro,A10s OLinuXino MICRO,Olimex,allwinner-a10s,A10s-OLinuXino-M_defconfig,arm-linux-gnueabihf,sun5i-a10s-olinuxino-micro
 
diff --git a/chips.csv b/chips.csv
index 5b620dc..bccb97e 100644
--- a/chips.csv
+++ b/chips.csv
@@ -25,6 +25,7 @@ allwinner-a64,A64,Allwinner,ARM Cortex A53,armv8,arm64
 allwinner-h5,H5,Allwinner,ARM Cortex A53,armv8,arm64
 allwinner-h6,H6,Allwinner,ARM Cortex A53,armv8,arm64
 allwinner-h616,H616,Allwinner,ARM Cortex A53,armv8,arm64
+allwinner-h618,H618,Allwinner,ARM Cortex A53,armv8,arm64
 
 rk3288,RK3288,Rockchip,ARM Cortex A17,armv7,armhf
 rk3328,RK3328,Rockchip,ARM Cortex A53,armv8,arm64
diff --git a/scripts/build-boot-sunxi b/scripts/build-boot-sunxi
index 6cf8890..fb88ed9 100755
--- a/scripts/build-boot-sunxi
+++ b/scripts/build-boot-sunxi
@@ -19,7 +19,7 @@ case "${CHIP_ID}" in
     export BL31="$(pwd)/arm-trusted-firmware/build/sun50i_h6/debug/bl31.bin"
     export SCP=/dev/null
     ;;
-*h616)
+*h616|*h618)
     build-atf sun50i_h616 "${TUPLE}"
     export BL31="$(pwd)/arm-trusted-firmware/build/sun50i_h616/debug/bl31.bin"
     export SCP=/dev/null