diff --git a/debian/changelog b/debian/changelog
index 8f7de8f4..e36c84d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 llvm-toolchain-18 (1:18.1.0~rc2-5) UNRELEASED; urgency=medium
 
+<<<<<<<
   [ John Paul Adrian Glaubitz ]
   * Install *clang_rt* on sparc and sparc64
   * Run chrpath for libclang on sparc and sparc64
@@ -9,6 +10,15 @@ llvm-toolchain-18 (1:18.1.0~rc2-5) UNRELEASED; urgency=medium
     see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1
     Ship libc++-18-dev /usr/lib/llvm-18/lib/libc++.modules.json /usr/lib/llvm-18/include/c++/v1/std.compat.cppm
     /usr/lib/llvm-18/include/c++/v1/std.cppm
+=======
+  [ John Paul Adrian Glaubitz ]
+  * Install *clang_rt* on sparc and sparc64
+  * Run chrpath for libclang on sparc and sparc64
+
+  [ Sylvestre Ledru ]
+  * add -DLIBCXX_INSTALL_MODULES=ON to install libc++ C++-20 modules
+    see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1
+>>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 19 Feb 2024 16:21:34 +0100
 
diff --git a/debian/libc++-X.Y-dev.install.in b/debian/libc++-X.Y-dev.install.in
index 208e5daf..1a4d26ee 100644
--- a/debian/libc++-X.Y-dev.install.in
+++ b/debian/libc++-X.Y-dev.install.in
@@ -3,6 +3,9 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a
 usr/lib/llvm-@LLVM_VERSION@/include/c++/
 usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/
 usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a
-build-llvm/modules/c++/v1/std.cppm usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/
-build-llvm/modules/c++/v1/std.compat.cppm usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/
-build-llvm/lib/libc++.modules.json usr/lib/llvm-@LLVM_VERSION@/lib/
+
+# C++ modules
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.modules.json
+usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/std.compat/*.inc
+usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/*.cppm
+usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/std/*.inc
diff --git a/debian/libllvmlibc-X.Y-dev.install.in b/debian/libllvmlibc-X.Y-dev.install.in
new file mode 100644
index 00000000..cd6c1add
--- /dev/null
+++ b/debian/libllvmlibc-X.Y-dev.install.in
@@ -0,0 +1 @@
+usr/lib/llvm-@LLVM_VERSION@/lib/libllvmlibc.a
diff --git a/debian/rules b/debian/rules
index 89269eb6..6f4f3fe7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -782,6 +782,7 @@ endif
 	-DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \
 	-DLIBCXX_INSTALL_LIBRARY=OFF \
 	-DLIBCXX_INSTALL_MODULES=ON \
+	-DBOOTSTRAP_LIBCXX_INSTALL_MODULES=ON \
 	-DOPENMP_ENABLE_LIBOMP_PROFILING=OFF \
 	-DOPENMP_ENABLE_LIBOMPTARGET_PROFILING=OFF \
 	-DLIBOMP_ENABLE_RTTI=OFF \