diff --git a/debian/patches/clang-apply-replacements.diff b/debian/patches/clang-apply-replacements.diff
new file mode 100644
index 00000000..38490b52
--- /dev/null
+++ b/debian/patches/clang-apply-replacements.diff
@@ -0,0 +1,35 @@
+Index: llvm-toolchain-3.7-3.7/clang-tools-extra/clang-modernize/Core/ReplacementHandling.cpp
+===================================================================
+--- llvm-toolchain-3.7-3.7.orig/clang-tools-extra/clang-modernize/Core/ReplacementHandling.cpp
++++ llvm-toolchain-3.7-3.7/clang-tools-extra/clang-modernize/Core/ReplacementHandling.cpp
+@@ -26,7 +26,7 @@ using namespace clang::tooling;
+ 
+ bool ReplacementHandling::findClangApplyReplacements(const char *Argv0) {
+   ErrorOr<std::string> CARPathOrErr =
+-      findProgramByName("clang-apply-replacements");
++      findProgramByName("clang-apply-replacements-3.8");
+   if (!CARPathOrErr)
+     return true;
+ 
+@@ -34,7 +34,7 @@ bool ReplacementHandling::findClangApply
+   static int StaticSymbol;
+   std::string ClangModernizePath = fs::getMainExecutable(Argv0, &StaticSymbol);
+   SmallString<128> TestPath = path::parent_path(ClangModernizePath);
+-  path::append(TestPath, "clang-apply-replacements");
++  path::append(TestPath, "clang-apply-replacements-3.8");
+   if (fs::can_execute(Twine(TestPath)))
+     CARPath = TestPath.str();
+ 
+Index: llvm-toolchain-3.7-3.7/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+===================================================================
+--- llvm-toolchain-3.7-3.7.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
++++ llvm-toolchain-3.7-3.7/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+@@ -111,7 +111,7 @@ def main():
+                       default='clang-tidy',
+                       help='path to clang-tidy binary')
+   parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
+-                      default='clang-apply-replacements',
++                      default='clang-apply-replacements-3.8',
+                       help='path to clang-apply-replacements binary')
+   parser.add_argument('-checks', default=None,
+                       help='checks filter, when not specified, use clang-tidy '
diff --git a/debian/patches/ubuntu-precise-compiler-rt.diff b/debian/patches/ubuntu-precise-compiler-rt.diff
new file mode 100644
index 00000000..86523bbc
--- /dev/null
+++ b/debian/patches/ubuntu-precise-compiler-rt.diff
@@ -0,0 +1,23 @@
+Index: llvm-toolchain-3.7-3.7/compiler-rt/make/platform/clang_linux.mk
+===================================================================
+--- llvm-toolchain-3.7-3.7.orig/compiler-rt/make/platform/clang_linux.mk
++++ llvm-toolchain-3.7-3.7/compiler-rt/make/platform/clang_linux.mk
+@@ -21,7 +21,7 @@ ifneq ($(findstring -linux-,$(CompilerTa
+ 
+ # Define configs only if arch in triple is i386 or x86_64
+ CompilerTargetArch := $(firstword $(subst -, ,$(CompilerTargetTriple)))
+-ifeq ($(call contains,i386 x86_64 i586,$(CompilerTargetArch)),true)
++ifeq ($(call contains,i386 x86_64 i586 i686,$(CompilerTargetArch)),true)
+ 
+ # TryCompile compiler source flags
+ # Returns exit code of running a compiler invocation.
+@@ -35,7 +35,7 @@
+     echo $$?)
+ 
+ test_source = $(ProjSrcRoot)/make/platform/clang_linux_test_input.c
+-ifneq (,$(filter $(CompilerTargetArch),i386 i586))
++ifneq (,$(filter $(CompilerTargetArch),i386 i586 i686))
+   SupportedArches := i386
+   ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0)
+     SupportedArches += x86_64
+