diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index a654bea..a1b35e4 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -305,10 +305,11 @@
 dtboimage: $(INSTALLED_DTBOIMAGE_TARGET)
 
 ifeq ($(BOARD_INCLUDE_DTB_IN_BOOTIMG),true)
-$(BOARD_PREBUILT_DTBIMAGE_DIR):
+$(INSTALLED_DTBIMAGE_TARGET):
 	echo -e ${CL_GRN}"Building DTBs"${CL_RST}
 	$(call make-dtb-target,$(KERNEL_DEFCONFIG))
 	$(call make-dtb-target,dtbs)
+	cat $(shell find $(DTBS_OUT)/arch/$(KERNEL_ARCH)/boot/dts/** -type f -name "*.dtb" | sort) > $@
 .PHONY: dtbimage
 dtbimage: $(INSTALLED_DTBIMAGE_TARGET)
 endif # BOARD_INCLUDE_DTB_IN_BOOTIMG
diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
index 580baa0..b0a75ef 100644
--- a/config/BoardConfigKernel.mk
+++ b/config/BoardConfigKernel.mk
@@ -137,10 +137,6 @@
 BOARD_PREBUILT_DTBOIMAGE ?= $(PRODUCT_OUT)/dtbo-pre.img
 endif
 
-ifeq ($(BOARD_INCLUDE_DTB_IN_BOOTIMG),true)
-BOARD_PREBUILT_DTBIMAGE_DIR ?= $(PRODUCT_OUT)/dtbs/arch/$(KERNEL_ARCH)/boot/dts/**
-endif
-
 # Set use the full path to the make command
 KERNEL_MAKE_CMD := $(BUILD_TOP)/prebuilts/build-tools/$(HOST_OS)-x86/bin/make