diff --git a/debian/changelog b/debian/changelog
index 17dfa3c1..ef9d513d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-snapshot (1:7~svn330801-1~exp3) experimental; urgency=medium
+
+  * Also ship diagtool
+
+ --
+
 llvm-toolchain-snapshot (1:7~svn330801-1~exp2) experimental; urgency=medium
 
   * d/p/force-gcc-header-obj.diff Fix the detection of the objc path
diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in
index fed92633..d38f270b 100644
--- a/debian/clang-tools-X.Y.install.in
+++ b/debian/clang-tools-X.Y.install.in
@@ -24,6 +24,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/find-all-symbols
 usr/lib/llvm-@LLVM_VERSION@/bin/clangd
 usr/lib/llvm-@LLVM_VERSION@/bin/clang-refactor
 usr/lib/llvm-@LLVM_VERSION@/bin/clang-func-mapping
+usr/lib/llvm-@LLVM_VERSION@/bin/diagtool
 
 tools/clang/tools/scan-build-@LLVM_VERSION@      usr/share/clang/
 tools/clang/tools/scan-build-py-@LLVM_VERSION@      usr/share/clang/
@@ -51,4 +52,4 @@ usr/bin/clang-import-test-@LLVM_VERSION@
 usr/bin/clangd-@LLVM_VERSION@
 usr/bin/clang-refactor-@LLVM_VERSION@
 usr/bin/clang-func-mapping-@LLVM_VERSION@
-
+usr/bin/diagtool-@LLVM_VERSION@