diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 1d7dc8686e84..26f509b25349 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,42 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20141124: new clang import which bumps version from 3.4.1 to 3.5.0.
+OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h
+OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h
+OLD_FILES+=usr/include/clang/3.4.1/altivec.h
+OLD_FILES+=usr/include/clang/3.4.1/ammintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/arm_neon.h
+OLD_FILES+=usr/include/clang/3.4.1/avx2intrin.h
+OLD_FILES+=usr/include/clang/3.4.1/avxintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/bmi2intrin.h
+OLD_FILES+=usr/include/clang/3.4.1/bmiintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/cpuid.h
+OLD_FILES+=usr/include/clang/3.4.1/emmintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/f16cintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/fma4intrin.h
+OLD_FILES+=usr/include/clang/3.4.1/fmaintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/immintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/lzcntintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/mm3dnow.h
+OLD_FILES+=usr/include/clang/3.4.1/mm_malloc.h
+OLD_FILES+=usr/include/clang/3.4.1/mmintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/module.map
+OLD_FILES+=usr/include/clang/3.4.1/nmmintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/pmmintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/popcntintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/prfchwintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/rdseedintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/rtmintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/shaintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/smmintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/tbmintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/tmmintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/wmmintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/x86intrin.h
+OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h
+OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h
+OLD_DIRS+=usr/include/clang/3.4.1
 # 20141109: faith/faithd removal
 OLD_FILES+=etc/rc.d/faith
 OLD_FILES+=usr/share/man/man4/faith.4.gz
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index fa643a80916b..ddd887958e54 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -489,41 +489,43 @@ OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/tblgen
-OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h
-OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h
-OLD_FILES+=usr/include/clang/3.4.1/altivec.h
-OLD_FILES+=usr/include/clang/3.4.1/ammintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/arm_neon.h
-OLD_FILES+=usr/include/clang/3.4.1/avx2intrin.h
-OLD_FILES+=usr/include/clang/3.4.1/avxintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/bmi2intrin.h
-OLD_FILES+=usr/include/clang/3.4.1/bmiintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/cpuid.h
-OLD_FILES+=usr/include/clang/3.4.1/emmintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/f16cintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/fma4intrin.h
-OLD_FILES+=usr/include/clang/3.4.1/fmaintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/immintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/lzcntintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/mm3dnow.h
-OLD_FILES+=usr/include/clang/3.4.1/mm_malloc.h
-OLD_FILES+=usr/include/clang/3.4.1/mmintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/module.map
-OLD_FILES+=usr/include/clang/3.4.1/nmmintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/pmmintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/popcntintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/prfchwintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/rdseedintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/rtmintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/shaintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/smmintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/tbmintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/tmmintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/wmmintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/x86intrin.h
-OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h
-OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h
-OLD_DIRS+=usr/include/clang/3.4.1
+OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
+OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h
+OLD_FILES+=usr/include/clang/3.5.0/altivec.h
+OLD_FILES+=usr/include/clang/3.5.0/ammintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/arm_acle.h
+OLD_FILES+=usr/include/clang/3.5.0/arm_neon.h
+OLD_FILES+=usr/include/clang/3.5.0/avx2intrin.h
+OLD_FILES+=usr/include/clang/3.5.0/avxintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/bmi2intrin.h
+OLD_FILES+=usr/include/clang/3.5.0/bmiintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/cpuid.h
+OLD_FILES+=usr/include/clang/3.5.0/emmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/f16cintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/fma4intrin.h
+OLD_FILES+=usr/include/clang/3.5.0/fmaintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/ia32intrin.h
+OLD_FILES+=usr/include/clang/3.5.0/immintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/lzcntintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/mm3dnow.h
+OLD_FILES+=usr/include/clang/3.5.0/mm_malloc.h
+OLD_FILES+=usr/include/clang/3.5.0/mmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/module.modulemap
+OLD_FILES+=usr/include/clang/3.5.0/nmmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/pmmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/popcntintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/prfchwintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/rdseedintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/rtmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/shaintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/smmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/tbmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/tmmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/wmmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/x86intrin.h
+OLD_FILES+=usr/include/clang/3.5.0/xmmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/xopintrin.h
+OLD_DIRS+=usr/include/clang/3.5.0
 OLD_DIRS+=usr/include/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang