diff --git a/core/config.mk b/core/config.mk
index f35b44e..64a5dd0 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -122,6 +122,7 @@
 board_config_mk := \
 	$(strip $(wildcard \
 		$(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \
+		device/*/$(TARGET_DEVICE)/BoardConfig.mk \
 		vendor/*/$(TARGET_DEVICE)/BoardConfig.mk \
 	))
 ifeq ($(board_config_mk),)
diff --git a/core/product.mk b/core/product.mk
index a9a24d2..5417242 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -23,7 +23,8 @@
 # $(call ) isn't necessary.
 #
 define _find-android-products-files
-$(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk) \
+$(shell test -d device && find device -maxdepth 6 -name AndroidProducts.mk) \
+  $(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk) \
   $(SRC_TARGET_DIR)/product/AndroidProducts.mk
 endef