diff --git a/debian/changelog b/debian/changelog
index 03c3c6db..a82fed73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-llvm-toolchain-12 (1:12.0.1-19) UNRELEASED; urgency=medium
+llvm-toolchain-12 (1:12.0.1-20) unstable; urgency=medium
+
+  * Also install usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a
+    usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a
+    in libclang-X.Y-dev
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 13 Feb 2022 14:04:40 +0100
+
+llvm-toolchain-12 (1:12.0.1-19) unstable; urgency=medium
 
   * Build clangd with GRPC support
     Thanks to Sam McCall for the patch
diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in
index b967aff8..6bd7a385 100644
--- a/debian/libclang-X.Y-dev.install.in
+++ b/debian/libclang-X.Y-dev.install.in
@@ -5,3 +5,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a
 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
+
+# clangd
+usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a
+usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a
diff --git a/debian/rules b/debian/rules
index 980d0cad..5a325b6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -695,9 +695,6 @@ override_dh_auto_install:
 	# Remove an example - introduced in https://reviews.llvm.org/D61446
 	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libBye.a
 
-	# Remove unused clangd lib
-	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libRemoteIndexProto.a $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libRemoteIndexServiceProto.a
-
 	cp $(TARGET_BUILD_STAGE2)/bin/clang-query $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin
 
 	# Only run on executable, not script