diff --git a/build.config.msm.lahaina b/build.config.msm.lahaina
index 2b9bee9ebf67..9c8d815ee7ec 100644
--- a/build.config.msm.lahaina
+++ b/build.config.msm.lahaina
@@ -9,6 +9,10 @@ MSM_ARCH=lahaina
 VARIANTS=(gki)
 [ -z "${VARIANT}" ] && VARIANT=gki
 
+if [ -e "${ROOT_DIR}/msm-kernel" -a "${KERNEL_DIR}" = "common" ]; then
+	KERNEL_DIR="msm-kernel"
+fi
+
 DT_OVERLAY_SUPPORT=1
 
 BOOT_IMAGE_HEADER_VERSION=3
diff --git a/build.config.msm.waipio b/build.config.msm.waipio
index eb2080383761..d1e9f5acbbef 100644
--- a/build.config.msm.waipio
+++ b/build.config.msm.waipio
@@ -9,6 +9,10 @@ MSM_ARCH=waipio
 VARIANTS=(consolidate gki)
 [ -z "${VARIANT}" ] && VARIANT=consolidate
 
+if [ -e "${ROOT_DIR}/msm-kernel" -a "${KERNEL_DIR}" = "common" ]; then
+	KERNEL_DIR="msm-kernel"
+fi
+
 BOOT_IMAGE_HEADER_VERSION=3
 BASE_ADDRESS=0x80000000
 PAGE_SIZE=4096
diff --git a/build.config.msm.waipio.tuivm b/build.config.msm.waipio.tuivm
index c280ad23e2ae..6f13ae082820 100644
--- a/build.config.msm.waipio.tuivm
+++ b/build.config.msm.waipio.tuivm
@@ -10,6 +10,10 @@ MSM_ARCH=waipio_tuivm
 VARIANTS=(defconfig debug_defconfig)
 [ -z "${VARIANT}" ] && VARIANT=debug_defconfig
 
+if [ -e "${ROOT_DIR}/msm-kernel" -a "${KERNEL_DIR}" = "common" ]; then
+	KERNEL_DIR="msm-kernel"
+fi
+
 BOOT_IMAGE_HEADER_VERSION=3
 BASE_ADDRESS=0x80000000
 PAGE_SIZE=4096