diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh
index bf7ea37626..f86323082c 100644
--- a/lib/functions/rootfs/distro-agnostic.sh
+++ b/lib/functions/rootfs/distro-agnostic.sh
@@ -299,6 +299,9 @@ PRE_INSTALL_KERNEL_DEBS
 				install_deb_chroot "${DEB_STORAGE}/${CHOSEN_KERNEL/image/dtb}_${REVISION}_${ARCH}.deb"
 			fi
 			if [[ $INSTALL_HEADERS == yes ]]; then
+				chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive \
+					apt-get ${APT_EXTRA_DIST_PARAMS} -yqq --no-install-recommends \
+					install build-essential kmod debhelper devscripts" >> "${DEST}"/${LOG_SUBPATH}/install.log
 				install_deb_chroot "${DEB_STORAGE}/${CHOSEN_KERNEL/image/headers}_${REVISION}_${ARCH}.deb"
 			fi
 		else
diff --git a/packages/armbian/builddeb b/packages/armbian/builddeb
index a76a2185bc..8df6596ee8 100755
--- a/packages/armbian/builddeb
+++ b/packages/armbian/builddeb
@@ -94,9 +94,9 @@ create_package() {
 			echo "Compiling headers - please wait ..."
 			NCPU=\$(grep -c 'processor' /proc/cpuinfo)
 			find -type f -exec touch {} +
-			yes "" | make oldconfig >/dev/null
-			make -j\$NCPU -s scripts >/dev/null
-			make -j\$NCPU -s M=scripts/mod/ >/dev/null
+			yes "" | make ARCH=$ARCH oldconfig >/dev/null
+			make -j\$NCPU ARCH=$ARCH -s scripts >/dev/null
+			make -j\$NCPU ARCH=$ARCH -s M=scripts/mod/ >/dev/null
 			exit 0
 		EOT