diff --git a/debian/changelog b/debian/changelog
index 35650e0e..7a1b1e29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 llvm-toolchain-snapshot (1:7~svn330801-1~exp3) experimental; urgency=medium
 
-  * Also ship diagtool
+  * Also ship diagtool in clang-tools-X
+  * Also ship hmaptool in clang-tools-X
   * Enable WebAssembly & AVR as experimental archs (Closes: #899202)
   * 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 d38f270b..8bfe1f6d 100644
--- a/debian/clang-tools-X.Y.install.in
+++ b/debian/clang-tools-X.Y.install.in
@@ -25,6 +25,7 @@ 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
+usr/lib/llvm-@LLVM_VERSION@/bin/hmaptool
 
 tools/clang/tools/scan-build-@LLVM_VERSION@      usr/share/clang/
 tools/clang/tools/scan-build-py-@LLVM_VERSION@      usr/share/clang/
@@ -53,3 +54,4 @@ usr/bin/clangd-@LLVM_VERSION@
 usr/bin/clang-refactor-@LLVM_VERSION@
 usr/bin/clang-func-mapping-@LLVM_VERSION@
 usr/bin/diagtool-@LLVM_VERSION@
+usr/bin/hmaptool-@LLVM_VERSION@