diff --git a/debian/changelog b/debian/changelog
index 7a4af5c5..a5af68f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 llvm-toolchain-9 (1:9~+rc1-1~exp2) UNRELEASED; urgency=medium
 
+  [ Gianfranco Costamagna ]
   * Fixed wrong shlib generation of libomp5 library
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 01 Aug 2019 19:06:11 +0200
+  [ Sylvestre Ledru ]
+  * Move lit-cpuid from llvm-tools to lldb (wrong package)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 03 Aug 2019 11:41:07 +0200
 
 llvm-toolchain-9 (1:9~+rc1-1~exp1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4715e134..cf19c921 100644
--- a/debian/control
+++ b/debian/control
@@ -442,6 +442,8 @@ Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}), llvm-9-dev,
  python-lldb-9
 Pre-Depends: ${misc:Pre-Depends}
+Replaces: llvm-9-tools (<< 9~+rc1-1~exp2)
+Breaks: llvm-9-tools (<< 9~+rc1-1~exp2)
 Description: Next generation, high-performance debugger
  LLDB is a next generation, high-performance debugger. It is built as a set of
  reusable components which highly leverage existing libraries in the larger LLVM
diff --git a/debian/lldb-X.Y.install.in b/debian/lldb-X.Y.install.in
index eff6bd03..d6ed3057 100644
--- a/debian/lldb-X.Y.install.in
+++ b/debian/lldb-X.Y.install.in
@@ -2,6 +2,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/lldb*
 usr/lib/llvm-@LLVM_VERSION@/bin/lldb-mi*
 usr/lib/llvm-@LLVM_VERSION@/bin/lldb-server*
 usr/lib/llvm-@LLVM_VERSION@/bin/lldb-argdumper
+usr/lib/llvm-@LLVM_VERSION@/bin/lit-cpuid
 
 usr/bin/lldb-@LLVM_VERSION@*
 usr/bin/lldb-server-@LLVM_VERSION@*
@@ -9,3 +10,4 @@ usr/bin/lldb-mi-@LLVM_VERSION@*
 usr/bin/lldb-argdumper-@LLVM_VERSION@
 usr/bin/lldb-vscode-@LLVM_VERSION@
 usr/bin/lldb-instr-@LLVM_VERSION@
+usr/bin/lit-cpuid-@LLVM_VERSION@
diff --git a/debian/llvm-X.Y-tools.install.in b/debian/llvm-X.Y-tools.install.in
index 16573d01..282dd225 100644
--- a/debian/llvm-X.Y-tools.install.in
+++ b/debian/llvm-X.Y-tools.install.in
@@ -2,7 +2,6 @@
 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/lit-cpuid
 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
@@ -15,4 +14,3 @@ 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/lit-cpuid-@LLVM_VERSION@
\ No newline at end of file