diff --git a/config/sources/mvebu64.conf b/config/sources/mvebu64.conf
index 8cbfca5899..f83d8fe03f 100644
--- a/config/sources/mvebu64.conf
+++ b/config/sources/mvebu64.conf
@@ -3,7 +3,7 @@ KERNEL_IMAGE_TYPE=Image
 #OFFSET=2
 
 BOOTSCRIPT="boot-espressobin.cmd:boot.cmd"
-UBOOT_TARGET_MAP=";;u-boot.bin"
+UBOOT_TARGET_MAP=";;u-boot.bin flash-image.bin"
 
 BOOTSOURCE='https://github.com/MarvellEmbeddedProcessors/u-boot-marvell.git'
 BOOTDIR=$MAINLINE_UBOOT_DIR
@@ -15,6 +15,12 @@ UBOOT_USE_GCC='< 7.0'
 BOOTENV_FILE='clearfog-default.txt'
 HAS_UUID_SUPPORT=yes
 
+ATFSOURCE='https://github.com/MarvellEmbeddedProcessors/atf-marvell'
+ATFDIR='arm-trusted-firmware-espressobin'
+ATFBRANCH='branch:atf-v1.3-armada-17.10'
+ATF_USE_GCC='== 4.9'
+ATF_COMPILER='arm-linux-gnueabi-'
+ATF_TARGET_MAP='DEBUG=1 USE_COHERENT_MEM=0 LOG_LEVEL=20 SECURE=0 CLOCKSPRESET=CPU_800_DDR_800 DDR_TOPOLOGY=2 BOOTDEV=EMMCNORM PARTNUM=0 PLAT=a3700;;build/a3700/debug/bl31.bin'
 case $BRANCH in
 	default)
 	KERNELSOURCE='https://github.com/MarvellEmbeddedProcessors/linux-marvell.git'
@@ -61,3 +67,15 @@ family_tweaks()
 	echo "#Marvell Espressobin Console" >> $SDCARD/etc/securetty
 	echo "ttyMV0" >> $SDCARD/etc/securetty
 }
+
+uboot_custom_postprocess()
+{
+	local atfdir="$SRC/cache/sources/$ATFDIR/${ATFBRANCH##*:}"
+	local ubootdir="$SRC/cache/sources/$BOOTDIR/${BOOTBRANCH##*:}"
+	toolchain=$(find_toolchain "$ATF_COMPILER" "$ATF_USE_GCC")
+	cd $atfdir
+	display_alert "Building boot image" "" "info"
+    make DEBUG=1 USE_COHERENT_MEM=0 LOG_LEVEL=20 SECURE=0 CLOCKSPRESET=CPU_800_DDR_800 DDR_TOPOLOGY=2 BOOTDEV=EMMCNORM PARTNUM=0 PLAT=a3700 all fip BL33=$SRC/cache/sources/$BOOTDIR/${BOOTBRANCH##*:}/u-boot.bin WTP=../../marvell-tools $CTHREADS CROSS_COMPILE=$ATF_COMPILER > /dev/null 2>&1
+	cp build/a3700/debug/flash-image.bin $ubootdir
+	cd $ubootdir
+}
\ No newline at end of file
diff --git a/lib/main.sh b/lib/main.sh
index 91f28e62e1..b6cb37e0e5 100644
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -260,6 +260,7 @@ if [[ $IGNORE_UPDATES != yes ]]; then
 	fetch_from_repo "https://github.com/linux-sunxi/sunxi-tools" "sunxi-tools" "branch:master"
 	fetch_from_repo "https://github.com/armbian/config" "armbian-config" "branch:dev"
 	fetch_from_repo "https://github.com/rockchip-linux/rkbin" "rkbin-tools" "branch:master"
+	fetch_from_repo "https://github.com/MarvellEmbeddedProcessors/A3700-utils-marvell" "marvell-tools" "branch:A3700_utils-armada-17.10"
 fi
 
 compile_sunxi_tools