diff --git a/debian/changelog b/debian/changelog
index 76375329..75f6e4b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 llvm-toolchain-18 (1:18.1.8-4) UNRELEASED; urgency=medium
 
+  * fix the symlinks after LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF
+    Probably caused
+    https://github.com/llvm/llvm-project/issues/99017
+
   [ Matthias Klose ]
   * Construct the --package-metadata option just from ELF_PACKAGE_METADATA.
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 15 Jul 2024 12:30:36 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 16 Jul 2024 18:02:17 +0200
 
 llvm-toolchain-18 (1:18.1.8-3) unstable; urgency=medium
 
diff --git a/debian/libc++1-X.Y.links.in b/debian/libc++1-X.Y.links.in
index 1e34d1d4..a12b1707 100644
--- a/debian/libc++1-X.Y.links.in
+++ b/debian/libc++1-X.Y.links.in
@@ -1,2 +1,4 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0
+# when LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON:
+#usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0
 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0	/usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1
diff --git a/debian/libc++abi1-X.Y.links.in b/debian/libc++abi1-X.Y.links.in
index 8d706053..b054e34b 100644
--- a/debian/libc++abi1-X.Y.links.in
+++ b/debian/libc++abi1-X.Y.links.in
@@ -1,2 +1,4 @@
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0
+# when LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON:
 usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libc++abi.so.1.0  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0
 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0	/usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1
diff --git a/debian/libunwind-X.Y-dev.links.in b/debian/libunwind-X.Y-dev.links.in
index e00c7d14..ea1b58ac 100644
--- a/debian/libunwind-X.Y-dev.links.in
+++ b/debian/libunwind-X.Y-dev.links.in
@@ -1,2 +1,5 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.so /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so
-usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.a /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.a
+usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so
+usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.a /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.a
+# when LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON:
+#usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.so /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so
+#usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.a /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.a
diff --git a/debian/libunwind-X.Y.links.in b/debian/libunwind-X.Y.links.in
index 530f3966..db1c89c3 100644
--- a/debian/libunwind-X.Y.links.in
+++ b/debian/libunwind-X.Y.links.in
@@ -1,2 +1,4 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0
+usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0
+# when LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON:
+#usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0
 usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0  /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1