diff --git a/debian/changelog b/debian/changelog
index a531eaa0..31189849 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ llvm-toolchain-10 (1:10.0.0~+rc2-3) unstable; urgency=medium
   * Disable libfuzzer on x86
     https://bugs.llvm.org/show_bug.cgi?id=43677
     FTBFS otherwise
+  * Add a libclang-cpp10-dev package (needed to unbreak the cmake)
+    https://bugs.llvm.org/show_bug.cgi?id=42432
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 01 Mar 2020 20:59:25 +0100
 
diff --git a/debian/control b/debian/control
index aa197230..9721ba0e 100644
--- a/debian/control
+++ b/debian/control
@@ -188,6 +188,33 @@ Description: C++ interface to the Clang library
  locations with elements within the AST, and other facilities that support
  Clang-based development tools.
 
+Package: libclang-cpp10-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
+ libclang-cpp10 (= ${binary:Version})
+# Move of libclang-cpp.so into libclang-cpp10.dev
+Breaks: libclang-10-dev (<< 1:10.0.0~+rc2-3)
+Replaces: libclang-10-dev (<< 1:10.0.0~+rc2-3)
+Description: C++ interface to the Clang library
+ Clang project is a C, C++, Objective C and Objective C++ front-end
+ based on the LLVM compiler. Its goal is to offer a replacement to the
+ GNU Compiler Collection (GCC).
+ .
+ Clang implements all of the ISO C++ 1998, 11 and 14 standards and also
+ provides most of the support of C++17.
+ .
+ This package contains the Clang C++ library.
+ .
+ The C++ Interface to Clang provides an API that exposes
+ facilities for parsing source code into an abstract syntax tree (AST),
+ loading already-parsed ASTs, traversing the AST, associating physical source
+ locations with elements within the AST, and other facilities that support
+ Clang-based development tools.
+ .
+ This package contains the Clang headers to develop extensions over
+ libclang-cpp10.
+
 
 Package: libfuzzer-10-dev
 Architecture: linux-any
diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in
index 55889786..e8653734 100644
--- a/debian/libclang-X.Y-dev.install.in
+++ b/debian/libclang-X.Y-dev.install.in
@@ -1,5 +1,6 @@
 usr/lib/llvm-@LLVM_VERSION@/include/clang
 usr/lib/llvm-@LLVM_VERSION@/include/clang-c
 usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a
-usr/lib/llvm-@LLVM_VERSION@/lib/libclang*so
+usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so
+usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@*.so
 usr/lib/llvm-@LLVM_VERSION@/lib/libfindAllSymbols.a
diff --git a/debian/libclang-cppX.Y-dev.install.in b/debian/libclang-cppX.Y-dev.install.in
new file mode 100644
index 00000000..925548f0
--- /dev/null
+++ b/debian/libclang-cppX.Y-dev.install.in
@@ -0,0 +1 @@
+usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp@LLVM_VERSION^.so
diff --git a/debian/rules b/debian/rules
index 8e224ad9..b9db5a59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -552,6 +552,7 @@ override_dh_auto_install:
 	chrpath -d libcxx/build/lib/libc++.so.1.0
 
 	cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \
+	cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-cpp$(LLVM_VERSION).so; \
 	ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT)
 
 	cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && mv libclang-cpp.so.$(LLVM_VERSION) libclang-cpp-$(LLVM_VERSION).so.$(SONAME_EXT); \