diff --git a/config/sources/arm64.conf b/config/sources/arm64.conf
index 90b1ed1f3..7b84e4e1f 100644
--- a/config/sources/arm64.conf
+++ b/config/sources/arm64.conf
@@ -1,3 +1,5 @@
+NAME_KERNEL="Image"
+NAME_INITRD="uInitrd"
 MAIN_CMDLINE="rootflags=data=writeback rw no_console_suspend consoleblank=0 fsck.fix=yes fsck.repair=yes net.ifnames=0 bootsplash.bootfile=bootsplash.armbian"
 INITRD_ARCH=arm64
 QEMU_BINARY="qemu-aarch64-static"
diff --git a/config/sources/armhf.conf b/config/sources/armhf.conf
index 3b26b58f3..0124e3efc 100644
--- a/config/sources/armhf.conf
+++ b/config/sources/armhf.conf
@@ -1,3 +1,6 @@
+NAME_KERNEL="zImage"
+NAME_INITRD="uInitrd"
+MAIN_CMDLINE="rootflags=data=writeback rw no_console_suspend consoleblank=0 fsck.fix=yes fsck.repair=yes net.ifnames=0 bootsplash.bootfile=bootsplash.armbian"
 INITRD_ARCH=arm
 QEMU_BINARY="qemu-arm-static"
 ARCHITECTURE=arm
diff --git a/lib/distributions.sh b/lib/distributions.sh
index d6bb1e9aa..43164ac23 100644
--- a/lib/distributions.sh
+++ b/lib/distributions.sh
@@ -171,11 +171,14 @@ install_common()
 		mkdir -p $SDCARD/boot/extlinux
 		cat <<-EOF > "$SDCARD/boot/extlinux/extlinux.conf"
 		LABEL Armbian
-		  LINUX /boot/Image
-		  INITRD /boot/uInitrd
-		  FDT /boot/dtb/$BOOT_FDT_FILE
+		  LINUX /boot/$NAME_KERNEL
+		  INITRD /boot/$NAME_INITRD
 	EOF
-
+		if [[ -n $BOOT_FDT_FILE ]]; then
+			echo "  FDT /boot/dtb/$BOOT_FDT_FILE" >> "$SDCARD/boot/extlinux/extlinux.conf"
+		else
+			echo "  FDTDIR /boot/dtb/" >> "$SDCARD/boot/extlinux/extlinux.conf"
+		fi
 	else
 
 		if [ -f "${USERPATCHES_PATH}/bootscripts/${bootscript_src}" ]; then