diff --git a/debian/changelog b/debian/changelog
index abd6616f..f45f71d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ llvm-toolchain-snapshot (1:14~++20210926041028+6063e6b499c7-1~exp1) UNRELEASED;
 
   * experimental New snapshot release
   * Bring back the libc++/libc++abi options
+  * Fix the libc++/libc++abi symlink issues after their moves in the triple directory
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 26 Sep 2021 16:14:44 +0200
 
diff --git a/debian/libc++1-X.Y.links.in b/debian/libc++1-X.Y.links.in
index 4d1955c5..4c155e99 100644
--- a/debian/libc++1-X.Y.links.in
+++ b/debian/libc++1-X.Y.links.in
@@ -1,2 +1,2 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0
+usr/lib/llvm-@LLVM_VERSION@/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.0	/usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1
diff --git a/debian/libc++abi-X.Y-dev.links.in b/debian/libc++abi-X.Y-dev.links.in
index 6dd5f555..6d4cd4de 100644
--- a/debian/libc++abi-X.Y-dev.links.in
+++ b/debian/libc++abi-X.Y-dev.links.in
@@ -1 +1 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so
+usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH@/libc++abi.so  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so
diff --git a/debian/libc++abi1-X.Y.links.in b/debian/libc++abi1-X.Y.links.in
index a57ef065..8d294987 100644
--- a/debian/libc++abi1-X.Y.links.in
+++ b/debian/libc++abi1-X.Y.links.in
@@ -1,2 +1,2 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0
+usr/lib/llvm-@LLVM_VERSION@/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.0	/usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1
diff --git a/debian/rules b/debian/rules
index 79e87884..f3882b15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -829,6 +829,18 @@ override_dh_installdeb:
 # Remove auto generated python pyc
 	find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f
 
+# Symlink the weird llvm triple to Debian's
+# I know it is ugly but I cannot use debian dh_links as I don't know what
+# will be the llvm triple on other archs
+
+	T=$(shell grep LLVM_HOST_TRIPLE $(CURDIR)/debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMConfig.cmake|cut -d\" -f2); \
+	echo "triple = $$T"; \
+	cd $(CURDIR)/debian/libc++abi1-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/; \
+	ln -s $$T $(DEB_HOST_MULTIARCH); \
+	cd - && cd $(CURDIR)/debian/libunwind-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/; \
+    ln -s $$T $(DEB_HOST_MULTIARCH)
+
+
 ifeq (${RUN_TEST},yes)
 # List of the archs we know we have 100 % tests working
 ARCH_LLVM_TEST_OK := i386 amd64