diff --git a/debian/changelog b/debian/changelog
index e687a8f2..f696d0e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ llvm-toolchain-9 (1:9.0.1~+rc1-1~exp2) experimental; urgency=medium
 
   * Fix some paths, upstream moved from site-packages
     to dist-packages for python packages
-  * Move yaml-bench from libclang-common-X.Y-dev to llvm-X.Y-dev where
+  * Move yaml-bench from libclang-common-X.Y-dev to llvm-X.Y-tools where
     it belongs
     See http://lists.llvm.org/pipermail/llvm-dev/2019-December/137337.html
   * Add a project in the cmake-test to silent a warning
diff --git a/debian/control b/debian/control
index 98cf3292..49175186 100644
--- a/debian/control
+++ b/debian/control
@@ -320,8 +320,6 @@ Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends},
  llvm-9 (= ${binary:Version}), libllvm9 (= ${binary:Version}), libtinfo-dev,
  llvm-9-tools (= ${binary:Version}), libz3-dev
-Breaks: libclang-common-9-dev (<< 9.0.1~+rc1-1~exp2)
-Replaces: libclang-common-9-dev (<< 9.0.1~+rc1-1~exp2)
 Description: Modular compiler and toolchain technologies, libraries and headers
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
@@ -343,6 +341,9 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python, python3,
  python-pygments, python-yaml,
  python3-pygments, python3-yaml
+# Because of yaml-bench
+Breaks: libclang-common-9-dev (<< 9.0.1~+rc1-1~exp2)
+Replaces: libclang-common-9-dev (<< 9.0.1~+rc1-1~exp2)
 Description: Modular compiler and toolchain technologies, tools
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in
index 84458068..a6acd028 100644
--- a/debian/llvm-X.Y-dev.install.in
+++ b/debian/llvm-X.Y-dev.install.in
@@ -29,6 +29,3 @@ llvm/utils/vim/llvm-@LLVM_VERSION@-vimrc		            usr/share/vim/addons
 llvm/utils/emacs/emacs.el		    usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/
 llvm/utils/emacs/llvm-mode.el	    usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/
 llvm/utils/emacs/tablegen-mode.el	usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/
-
-usr/lib/llvm-@LLVM_VERSION@/bin/yaml-bench
-usr/bin/yaml-bench-@LLVM_VERSION@
diff --git a/debian/llvm-X.Y-tools.install.in b/debian/llvm-X.Y-tools.install.in
index fed288a2..0ceef3f4 100644
--- a/debian/llvm-X.Y-tools.install.in
+++ b/debian/llvm-X.Y-tools.install.in
@@ -2,6 +2,7 @@
 usr/lib/llvm-@LLVM_VERSION@/bin/count
 usr/lib/llvm-@LLVM_VERSION@/bin/FileCheck
 usr/lib/llvm-@LLVM_VERSION@/bin/not
+usr/lib/llvm-@LLVM_VERSION@/bin/yaml-bench
 usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/opt-viewer.py
 usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/optrecord.py
 usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/style.css
@@ -9,8 +10,10 @@ usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/opt-diff.py
 usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/optpmap.py
 usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/opt-stats.py
 
+
 llvm/utils/lit/*             /usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/
 
 usr/bin/count-@LLVM_VERSION@
 usr/bin/FileCheck-@LLVM_VERSION@
 usr/bin/not-@LLVM_VERSION@
+usr/bin/yaml-bench-@LLVM_VERSION@