diff --git a/debian/changelog b/debian/changelog
index aa5f94c0..6bf9c0d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-3.8 (1:3.8.1-13) UNRELEASED; urgency=medium
+
+  * Fix a version issue with run-clang-tidy-4.0.py
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 12 Sep 2016 13:57:25 +0200
+
 llvm-toolchain-3.8 (1:3.8.1-12) unstable; urgency=medium
 
   * Fix a ftbfs on lldb on arm64 (Closes: #836591) (Closes: #836335)
diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff
new file mode 100644
index 00000000..8d92ea6a
--- /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.8',
+                       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 fe628b0a..244cb16a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,3 +48,5 @@ kfreebsd-support.diff
 asan-glibc-2.24.diff
 lldb-dont-assume-64bit-systems-are-all-x86-64.patch
 lldb-arm64.diff
+clang-tidy-run-bin.diff
+