diff --git a/debian/changelog b/debian/changelog
index 856dfaee..f266813c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ llvm-toolchain-3.9 (1:3.9-2) unstable; urgency=medium
   * Merge clang-include-fixer-3.9 into clang-3.9. Don't think
     it deserves it own package
   * python-lldb-3.9 archs "any" to a list like others pkg
+  * Fix a version issue with run-clang-tidy-4.0.py
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 02 Sep 2016 13:11:56 +0200
 
diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff
new file mode 100644
index 00000000..7e17ff50
--- /dev/null
+++ b/debian/patches/clang-tidy-run-bin.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-3.8-3.8.1/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+===================================================================
+--- llvm-toolchain-3.8-3.8.1.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
++++ llvm-toolchain-3.8-3.8.1/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+@@ -108,7 +108,7 @@ def main():
+                                    'clang-tidy and clang-apply-replacements in '
+                                    '$PATH.')
+   parser.add_argument('-clang-tidy-binary', metavar='PATH',
+-                      default='clang-tidy',
++                      default='clang-tidy-3.9',
+                       help='path to clang-tidy binary')
+   parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
+                       default='clang-apply-replacements',
diff --git a/debian/patches/series b/debian/patches/series
index ae379d5c..13512adc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,5 @@ fix-cmake-config-prefix.diff
 lldb-link-atomic-cmake.patch
 disable-llvm-symbolizer-test.diff
 kfreebsd-support.diff
+clang-tidy-run-bin.diff
+