diff --git a/debian/changelog b/debian/changelog
index 1d7b2346..b824b600 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-16 (1:16.0.5-1~exp1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 03 Jun 2023 12:00:55 +0200
+
 llvm-toolchain-16 (1:16.0.4-1~exp1) experimental; urgency=medium
 
   * New upstream release
@@ -202,6 +208,31 @@ llvm-toolchain-15 (1:15.0.7-2) unstable; urgency=medium
   [ Gianfranco Costamagna ]
   * Update print lldb python patch, following what was done
     in automake for newer python
+  [ Sylvestre Ledru ]
+  * Yeah, we would like to have this version in bookworm
+    (Closes: #1032316)
+  * Adjust some lintian overrides
+  * Disable flang on s390x. Seems that it is breaking
+
+  [ Gianfranco Costamagna ]
+  * Update print lldb python patch, following what was done
+    in automake for newer python
+
+  [ Samuel Thibault ]
+  * Fix disabling amdgpu on non-Linux.
+
+  [ John Paul Adrian Glaubitz ]
+  * Don't run chrpath for libclang on powerpc and powerpcspe
+
+  [ Faidon Liambotis ]
+  * Update the wasm-sysroot-usr.diff patch to restore functionality that was
+    accidentally dropped when the patch was forward-ported from 14 to 15. This
+    resolves an issue in which clang++ builds would fail if libc++-15-dev was
+    installed alongside libc++-15-dev-wasm32. (Closes: #1029010, #1032317)
+
+  [ Cordell Bloor ]
+  * Backport support for HIP in /usr and add Debian paths
+    for rocm-device-libs to search list (Closes: #1031808)
 
   [ Samuel Thibault ]
   * Fix disabling amdgpu on non-Linux.
diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in
index 786f4c65..fc672afe 100644
--- a/debian/libclang-rt-X.Y-dev.install.in
+++ b/debian/libclang-rt-X.Y-dev.install.in
@@ -7,4 +7,8 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h
 # See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH
+<<<<<<< Updated upstream
 [amd64 arm64 armhf armel i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*
+=======
+[amd64 armhf arm64 i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*
+>>>>>>> Stashed changes