diff --git a/debian/changelog b/debian/changelog
index ed97e7e2..e687a8f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,10 @@
-llvm-toolchain-9 (1:9~+20191203075642+e99a087fff6-1~exp1) UNRELEASED; urgency=medium
-
-  * experimental New snapshot release
-  * Fix some paths, upstream moved from site-packages
-    to dist-packages for python packages
-
- -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 03 Dec 2019 07:59:28 +0100
-
 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
+    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
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 03 Dec 2019 07:56:16 +0100
diff --git a/debian/control b/debian/control
index 9333d917..98cf3292 100644
--- a/debian/control
+++ b/debian/control
@@ -320,6 +320,8 @@ 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
diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in
index 0a1c7d11..4514f2cd 100644
--- a/debian/libclang-common-X.Y-dev.install.in
+++ b/debian/libclang-common-X.Y-dev.install.in
@@ -4,8 +4,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/*.txt
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/share/*.txt
 
-usr/lib/llvm-@LLVM_VERSION@/bin/yaml-bench
-
-usr/bin/yaml-bench-@LLVM_VERSION@
-
 
diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in
index e5e3fc65..84458068 100644
--- a/debian/llvm-X.Y-dev.install.in
+++ b/debian/llvm-X.Y-dev.install.in
@@ -30,3 +30,5 @@ 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@