diff --git a/lib/compilation.sh b/lib/compilation.sh
index d443d6f01..53bf5ed27 100644
--- a/lib/compilation.sh
+++ b/lib/compilation.sh
@@ -703,6 +703,21 @@ install_rkbin_tools()
 	fi
 }
 
+compile_xilinx_bootgen()
+{
+	# Compile and install only if git commit hash changed
+	cd "${SRC}"/cache/sources/xilinx-bootgen || exit
+	# need to check if /usr/local/bin/bootgen to detect new Docker containers with old cached sources
+	if [[ ! -f .commit_id || $(improved_git rev-parse @ 2>/dev/null) != $(<.commit_id) || ! -f /usr/local/bin/bootgen ]]; then
+		display_alert "Compiling" "xilinx-bootgen" "info"
+		make -s clean >/dev/null
+		make -s -j$(nproc) bootgen >/dev/null
+		mkdir -p /usr/local/bin/
+		install bootgen /usr/local/bin >/dev/null 2>&1
+		improved_git rev-parse @ 2>/dev/null > .commit_id
+	fi
+}
+
 grab_version()
 {
 	local ver=()
diff --git a/lib/main.sh b/lib/main.sh
index 8915b6769..71ec981ec 100644
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -427,9 +427,12 @@ fetch_from_repo "https://github.com/MarvellEmbeddedProcessors/binaries-marvell"
 fetch_from_repo "https://github.com/armbian/odroidc2-blobs" "odroidc2-blobs" "branch:master"
 fetch_from_repo "https://github.com/armbian/testings" "testing-reports" "branch:master"
 fetch_from_repo "https://github.com/LibreELEC/amlogic-boot-fip" "amlogic-boot-fip" "branch:master"
+fetch_from_repo "https://github.com/Xilinx/bootgen.git" "xilinx-bootgen" "branch:master"
+fetch_from_repo "https://github.com/tparys/xilinx-fsbl-blobs" "xilinx-fsbl" "branch:master"
 
 compile_sunxi_tools
 install_rkbin_tools
+compile_xilinx_bootgen
 
 for option in $(tr ',' ' ' <<< "$CLEAN_LEVEL"); do
 	[[ $option != sources ]] && cleaning "$option"