diff --git a/Makefile b/Makefile
index e2b00699abc6..d6c2636959ca 100644
--- a/Makefile
+++ b/Makefile
@@ -499,6 +499,8 @@ export RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o    \
 export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
 			 --exclude CVS --exclude .pc --exclude .hg --exclude .git
 
+KBUILD_CFLAGS	+= $(call cc-option,-Wno-misleading-indentation)
+
 # ===========================================================================
 # Rules shared between *config targets and build targets
 
diff --git a/build.config.common b/build.config.common
index e224a415783c..afc37efaf1c1 100644
--- a/build.config.common
+++ b/build.config.common
@@ -6,7 +6,7 @@ CC=clang
 LD=ld.lld
 NM=llvm-nm
 OBJCOPY=llvm-objcopy
-CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r370808/bin
+CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r383902/bin
 DEPMOD=depmod
 BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86