diff --git a/build.config.goldfish.arm b/build.config.goldfish.arm
index bab5366..866da93 100644
--- a/build.config.goldfish.arm
+++ b/build.config.goldfish.arm
@@ -3,7 +3,7 @@
 CROSS_COMPILE=arm-linux-androidkernel-
 DEFCONFIG=ranchu_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
 FILES="
 arch/arm/boot/zImage
diff --git a/build.config.goldfish.arm64 b/build.config.goldfish.arm64
index 0b4c406..9c963cf 100644
--- a/build.config.goldfish.arm64
+++ b/build.config.goldfish.arm64
@@ -3,7 +3,7 @@
 CROSS_COMPILE=aarch64-linux-android-
 DEFCONFIG=ranchu64_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
 FILES="
 arch/arm64/boot/Image
diff --git a/build.config.goldfish.mips b/build.config.goldfish.mips
index 5dcd8a1..8af53d2 100644
--- a/build.config.goldfish.mips
+++ b/build.config.goldfish.mips
@@ -3,7 +3,7 @@
 CROSS_COMPILE=mips64el-linux-android-
 DEFCONFIG=ranchu_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9/bin
 FILES="
 vmlinux
diff --git a/build.config.goldfish.mips64 b/build.config.goldfish.mips64
index 9c0b6cb..2a33d36 100644
--- a/build.config.goldfish.mips64
+++ b/build.config.goldfish.mips64
@@ -3,7 +3,7 @@
 CROSS_COMPILE=mips64el-linux-android-
 DEFCONFIG=ranchu64_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9/bin
 FILES="
 vmlinux
diff --git a/build.config.goldfish.x86 b/build.config.goldfish.x86
index 2b8a9b7..f86253f 100644
--- a/build.config.goldfish.x86
+++ b/build.config.goldfish.x86
@@ -3,7 +3,7 @@
 CROSS_COMPILE=x86_64-linux-android-
 DEFCONFIG=i386_ranchu_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin
 FILES="
 arch/x86/boot/bzImage
diff --git a/build.config.goldfish.x86_64 b/build.config.goldfish.x86_64
index 940caef..e173886 100644
--- a/build.config.goldfish.x86_64
+++ b/build.config.goldfish.x86_64
@@ -3,7 +3,7 @@
 CROSS_COMPILE=x86_64-linux-android-
 DEFCONFIG=x86_64_ranchu_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin
 FILES="
 arch/x86/boot/bzImage