diff --git a/debian/changelog b/debian/changelog
index 5a81f124..0a501dd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 llvm-toolchain-snapshot (1:3.6~svn214630-1~exp2) UNRELEASED; urgency=medium
 
   * Enable compressed debug sections (Closes: #757002)
+  * Force scan-build to use the same version of clang
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 04 Aug 2014 13:36:15 +0200
 
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
index 35178f94..9cd28bcc 100644
--- a/debian/patches/scan-build-clang-path.diff
+++ b/debian/patches/scan-build-clang-path.diff
@@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/tools/scan-build/scan-build
  # Find 'clang'
  if (!defined $AnalyzerDiscoveryMethod) {
 -  $Clang = Cwd::realpath("$RealBin/bin/clang");
-+  $Clang = Cwd::realpath("/usr/bin/clang");
++  $Clang = Cwd::realpath("/usr/lib/llvm-3.6/bin/clang");
    if (!defined $Clang || ! -x $Clang) {
      $Clang = Cwd::realpath("$RealBin/clang");
    }