diff --git a/debian/changelog b/debian/changelog
index 75f6e4b6..7111aa39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-llvm-toolchain-18 (1:18.1.8-4) UNRELEASED; urgency=medium
+llvm-toolchain-18 (1:18.1.8-4) unstable; urgency=medium
 
   * fix the symlinks after LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF
     Probably caused
     https://github.com/llvm/llvm-project/issues/99017
+  * Move back /usr/lib/llvm-18/lib/libLLVM-18.so.1 to libllvm18 (Closes: #1076469)
+    And add breaks/replaces to make sure the upgrade goes smoothly
 
   [ Matthias Klose ]
   * Construct the --package-metadata option just from ELF_PACKAGE_METADATA.
diff --git a/debian/control.in b/debian/control.in
index e0597212..73ba6ea2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -347,6 +347,8 @@ Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
+Breaks: llvm-@LLVM_VERSION@-dev (<< 1:18.1.8-4)
+Replaces: llvm-@LLVM_VERSION@-dev (<< 1:18.1.8-4)
 Description: Modular compiler and toolchain technologies, runtime library
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in
index 067b0884..b6cbdb92 100644
--- a/debian/libllvmX.Y.links.in
+++ b/debian/libllvmX.Y.links.in
@@ -1,4 +1,9 @@
 # Should be uncommented for @LLVM_VERSION@.1 and other
 # usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1
-usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1    /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so
 
+usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1    /usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1    /usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1    /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1
+
+# Should be in llvm-X.Y-dev but as it has been this way for a long time...
+usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1    /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so
diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in
index b3a2a2ae..16e529c7 100644
--- a/debian/llvm-X.Y-dev.links.in
+++ b/debian/llvm-X.Y-dev.links.in
@@ -1,8 +1,5 @@
 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so
-usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1
-usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so.1
 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so
-usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1       usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1
 
 usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/include/llvm-c
 usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/include/llvm