diff --git a/debian/changelog b/debian/changelog
index b1e315b1..ed9bc4e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-17 (1:17.0.6-6) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.6-6) unstable; urgency=medium
 
   [ chenli ]
   * Enable flang on loong64
@@ -6,6 +6,12 @@ llvm-toolchain-17 (1:17.0.6-6) UNRELEASED; urgency=medium
   [ Sylvestre Ledru ]
   * try to enable sccache on 'my' s390x machines
 
+  [ Steve Langasek ]
+  * Rename libraries for 64-bit time_t transition.
+
+  [ Gianfranco Costamagna ]
+  * Fix 32bit builds
+
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 24 Jan 2024 13:29:35 +0100
 
 llvm-toolchain-17 (1:17.0.6-5) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 6ef2fb2f..d7551988 100644
--- a/debian/control
+++ b/debian/control
@@ -45,10 +45,10 @@ Package: clang-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc},
- libllvm17 (= ${binary:Version}),
+ libllvm17t64 (= ${binary:Version}),
  libclang-common-17-dev (= ${source:Version}),
  llvm-17-linker-tools (= ${binary:Version}),
- libclang1-17 (= ${binary:Version}), libc6-dev, binutils
+ libclang1-17t64 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
 Recommends: llvm-17-dev, python3
 # libomp-17-dev
@@ -78,7 +78,7 @@ Description: clang-based tools for C/C++ developments
 Package: clang-format-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm17 (= ${binary:Version})
+ libllvm17t64 (= ${binary:Version})
 Description: Tool to format C/C++/Obj-C code
  Clang-format is both a library and a stand-alone tool with the goal of
  automatically reformatting C++ sources files according to configurable
@@ -94,7 +94,7 @@ Description: Tool to format C/C++/Obj-C code
 Package: clang-tidy-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm17 (= ${binary:Version}),
+ libllvm17t64 (= ${binary:Version}),
  libclang-common-17-dev (= ${source:Version}),
  clang-tools-17, python3-yaml
 Description: clang-based C++ linter tool
@@ -106,7 +106,7 @@ Description: clang-based C++ linter tool
 Package: clangd-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libllvm17 (= ${binary:Version}),
+ libllvm17t64 (= ${binary:Version}),
  libclang-common-17-dev (= ${source:Version}),
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
@@ -133,7 +133,10 @@ Description: C, C++ and Objective-C compiler - Documentation
  .
  This package contains the documentation.
 
-Package: libclang1-17
+Package: libclang1-17t64
+Provides: ${t64:Provides}
+Replaces: libclang1-17
+Breaks: libclang1-17 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -158,7 +161,7 @@ Package: libclang-17-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang1-17 (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang1-17t64 (= ${binary:Version}),
  libclang-common-17-dev (= ${source:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -234,10 +237,13 @@ Description: High-level loop and data-locality optimizer
 
 # ------------- clang libraries -------------
 
-Package: libclang-cpp17
+Package: libclang-cpp17t64
+Provides: ${t64:Provides}
+Replaces: libclang-cpp17
+Breaks: libclang-cpp17 (<< ${source:Version})
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -259,7 +265,7 @@ Package: libclang-cpp17-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang-cpp17 (= ${binary:Version})
+ libclang-cpp17t64 (= ${binary:Version})
 # Move of libclang-cpp.so into libclang-cpp17.dev
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -336,7 +342,10 @@ Description: Clang examples
 
 # ------------- LLVM -------------
 
-Package: libllvm17
+Package: libllvm17t64
+Provides: ${t64:Provides}
+Replaces: libllvm17
+Breaks: libllvm17 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -412,8 +421,8 @@ Description: Modular compiler and toolchain technologies, IR interpreter
 Package: llvm-17-dev
 Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
- llvm-17 (= ${binary:Version}), libllvm17 (= ${binary:Version}), libncurses-dev,
- llvm-17-tools (= ${binary:Version}), libclang-cpp17 (= ${binary:Version}),
+ llvm-17 (= ${binary:Version}), libllvm17t64 (= ${binary:Version}), libncurses-dev,
+ llvm-17-tools (= ${binary:Version}), libclang-cpp17t64 (= ${binary:Version}),
  libz3-dev, libxml2-dev
 Description: Modular compiler and toolchain technologies, libraries and headers
  LLVM is a collection of libraries and tools that make it easy to build
@@ -520,7 +529,7 @@ Description: Modular compiler and toolchain technologies, examples
 Package: lld-17
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker
  LLD is a new, high-performance linker. It is built as a set of reusable
@@ -530,7 +539,7 @@ Description: LLVM-based linker
 Package: liblld-17
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: LLVM-based linker, library
@@ -560,7 +569,7 @@ Description: LLVM-based linker, header files
 Package: lldb-17
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version}),
  python3-lldb-17
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
@@ -568,10 +577,13 @@ Description: Next generation, high-performance debugger
  reusable components which highly leverage existing libraries in the larger LLVM
  Project, such as the Clang expression parser and LLVM disassembler.
 
-Package: liblldb-17
+Package: liblldb-17t64
+Provides: ${t64:Provides}
+Replaces: liblldb-17
+Breaks: liblldb-17 (<< ${source:Version})
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: Next generation, high-performance debugger, library
@@ -585,7 +597,7 @@ Package: python3-lldb-17
 Section: python
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-17t64 (= ${binary:Version})
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
 Provides: python3-lldb-x.y
@@ -618,7 +630,7 @@ Description: Next generation, high-performance debugger, header files
 Package: libomp-17-dev
 Section: libdevel
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
-Depends: libomp5-17 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libomp5-17t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-17-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
 Provides: libomp-x.y-dev
@@ -629,14 +641,14 @@ Description: LLVM OpenMP runtime - dev package
  linked against, and that manages the multiple threads in an OpenMP program
  while it is executing.
 
-Package: libomp5-17
+Package: libomp5-17t64
 Multi-Arch: same
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libomp5 (<< 44)
-Provides: libomp-x.y
+Breaks: libomp5-17 (<< ${source:Version}), libomp5 (<< 44)
+Provides: ${t64:Provides}, libomp-x.y
 Conflicts: libomp-x.y
-Replaces: libomp-x.y
+Replaces: libomp5-17, libomp-x.y
 Description: LLVM OpenMP runtime
  The runtime is the part of the OpenMP implementation that your code is
  linked against, and that manages the multiple threads in an OpenMP program
@@ -658,17 +670,17 @@ Description: LLVM OpenMP runtime - Documentation
 
 # ------------- libcxx -------------
 
-Package: libc++1-17
+Package: libc++1-17t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: clang
-Breaks: libc++1 (<< 44)
-Provides: libc++-x.y
+Breaks: libc++1-17 (<< ${source:Version}), libc++1 (<< 44)
+Provides: ${t64:Provides}, libc++-x.y
 Conflicts: libc++-x.y
-Replaces: libc++-x.y
+Replaces: libc++1-17, libc++-x.y
 Description: LLVM C++ Standard library
  libc++ is another implementation of the C++ standard library.
  .
@@ -686,13 +698,13 @@ Package: libc++-17-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++1-17 (= ${binary:Version}), ${misc:Depends},
+Depends: libc++1-17t64 (= ${binary:Version}), ${misc:Depends},
  libc++abi-17-dev (= ${binary:Version}),
  libunwind-17-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
-Breaks: libc++-dev (<< 44), libc++abi-17-dev (<< 1:17.0.6-2)
+Breaks: libc++-dev (<< 44), libc++abi-17-dev (<< 1:17.0.6~++20231206041259)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
-Replaces: libc++-x.y-dev, libc++abi-17-dev (<< 1:17.0.6-2)
+Replaces: libc++-x.y-dev, libc++abi-17-dev (<< 1:17.0.6~++20231206041259)
 Description: LLVM C++ Standard library (development files)
  libc++ is another implementation of the C++ standard library
  .
@@ -731,16 +743,16 @@ Description: LLVM C++ Standard library (WASI)
 
 # ------------- libcxxabi -------------
 
-Package: libc++abi1-17
+Package: libc++abi1-17t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libc++abi1 (<< 44)
-Provides: libc++abi-x.y
+Breaks: libc++abi1-17 (<< ${source:Version}), libc++abi1 (<< 44)
+Provides: ${t64:Provides}, libc++abi-x.y
 Conflicts: libc++abi-x.y
-Replaces: libc++abi-x.y
+Replaces: libc++abi1-17, libc++abi-x.y
 Description: LLVM low level support for a standard C++ library
  libc++abi is another implementation of low level support for a standard C++
  library.
@@ -754,7 +766,7 @@ Package: libc++abi-17-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++abi1-17 (= ${binary:Version}), ${misc:Depends}
+Depends: libc++abi1-17t64 (= ${binary:Version}), ${misc:Depends}
 Breaks: libc++abi-dev (<= 44)
 Provides: libc++abi-x.y-dev
 Conflicts: libc++abi-x.y-dev
@@ -826,15 +838,16 @@ Description: OpenCL C language implementation - development files
 
 # ------------- libunwind -------------
 
-Package: libunwind-17
+Package: libunwind-17t64
+Breaks: libunwind-17 (<< ${source:Version})
 Section: libs
 Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libunwind-x.y
+Provides: ${t64:Provides}, libunwind-x.y
 Conflicts: libunwind-x.y
-Replaces: libunwind-x.y
+Replaces: libunwind-17, libunwind-x.y
 Description: production-quality unwinder
  libunwind is a production-quality unwinder, with platform support for DWARF
  unwind info, SjLj, and ARM EHABI.
@@ -849,7 +862,7 @@ Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libunwind-17 (= ${binary:Version})
+ libunwind-17t64 (= ${binary:Version})
 Provides: libunwind-dev, libunwind-x.y-dev
 Conflicts: libunwind-dev, libunwind-x.y-dev
 Replaces: libunwind-dev, libunwind-x.y-dev
@@ -874,15 +887,16 @@ Description: Multi-Level Intermediate Representation tools
  .
  This package provides tools.
 
-Package: libmlir-17
+Package: libmlir-17t64
+Breaks: libmlir-17 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libmlir-x.y
+Provides: ${t64:Provides}, libmlir-x.y
 Conflicts: libmlir-x.y
-Replaces: libmlir-x.y
+Replaces: libmlir-17, libmlir-x.y
 Description: Multi-Level Intermediate Representation library
  Novel approach to building reusable and extensible compiler infrastructure.
  MLIR aims to address software fragmentation, improve compilation for
@@ -896,7 +910,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libmlir-17 (= ${binary:Version})
+ libmlir-17t64 (= ${binary:Version})
 Breaks: libmlir-dev
 Provides: libmlir-x.y-dev
 Conflicts: libmlir-x.y-dev
diff --git a/debian/control.in b/debian/control.in
index 012f6ce3..94eb46f7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -45,10 +45,10 @@ Package: clang-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc},
- libllvm@LLVM_VERSION@ (= ${binary:Version}),
+ libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
  libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
- libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils
+ libclang1-@LLVM_VERSION@t64 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
 Recommends: llvm-@LLVM_VERSION@-dev, python3
 # libomp-@LLVM_VERSION@-dev
@@ -78,7 +78,7 @@ Description: clang-based tools for C/C++ developments
 Package: clang-format-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm@LLVM_VERSION@ (= ${binary:Version})
+ libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Description: Tool to format C/C++/Obj-C code
  Clang-format is both a library and a stand-alone tool with the goal of
  automatically reformatting C++ sources files according to configurable
@@ -94,7 +94,7 @@ Description: Tool to format C/C++/Obj-C code
 Package: clang-tidy-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm@LLVM_VERSION@ (= ${binary:Version}),
+ libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
  libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
  clang-tools-@LLVM_VERSION@, python3-yaml
 Description: clang-based C++ linter tool
@@ -106,7 +106,7 @@ Description: clang-based C++ linter tool
 Package: clangd-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libllvm@LLVM_VERSION@ (= ${binary:Version}),
+ libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
  libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
@@ -133,7 +133,10 @@ Description: C, C++ and Objective-C compiler - Documentation
  .
  This package contains the documentation.
 
-Package: libclang1-@LLVM_VERSION@
+Package: libclang1-@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: libclang1-@LLVM_VERSION@
+Breaks: libclang1-@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -158,7 +161,7 @@ Package: libclang-@LLVM_VERSION@-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@ (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@t64 (= ${binary:Version}),
  libclang-common-@LLVM_VERSION@-dev (= ${source:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -234,10 +237,13 @@ Description: High-level loop and data-locality optimizer
 
 # ------------- clang libraries -------------
 
-Package: libclang-cpp@LLVM_VERSION@
+Package: libclang-cpp@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: libclang-cpp@LLVM_VERSION@
+Breaks: libclang-cpp@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -259,7 +265,7 @@ Package: libclang-cpp@LLVM_VERSION@-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang-cpp@LLVM_VERSION@ (= ${binary:Version})
+ libclang-cpp@LLVM_VERSION@t64 (= ${binary:Version})
 # Move of libclang-cpp.so into libclang-cpp@LLVM_VERSION@.dev
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -336,7 +342,10 @@ Description: Clang examples
 
 # ------------- LLVM -------------
 
-Package: libllvm@LLVM_VERSION@
+Package: libllvm@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: libllvm@LLVM_VERSION@
+Breaks: libllvm@LLVM_VERSION@ (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -412,8 +421,8 @@ Description: Modular compiler and toolchain technologies, IR interpreter
 Package: llvm-@LLVM_VERSION@-dev
 Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
- llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@ (= ${binary:Version}), libncurses-dev,
- llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@ (= ${binary:Version}),
+ llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@t64 (= ${binary:Version}), libncurses-dev,
+ llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@t64 (= ${binary:Version}),
  libz3-dev, libxml2-dev
 Description: Modular compiler and toolchain technologies, libraries and headers
  LLVM is a collection of libraries and tools that make it easy to build
@@ -520,7 +529,7 @@ Description: Modular compiler and toolchain technologies, examples
 Package: lld-@LLVM_VERSION@
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker
  LLD is a new, high-performance linker. It is built as a set of reusable
@@ -530,7 +539,7 @@ Description: LLVM-based linker
 Package: liblld-@LLVM_VERSION@
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: LLVM-based linker, library
@@ -560,7 +569,7 @@ Description: LLVM-based linker, header files
 Package: lldb-@LLVM_VERSION@
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
  python3-lldb-@LLVM_VERSION@
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
@@ -568,10 +577,13 @@ Description: Next generation, high-performance debugger
  reusable components which highly leverage existing libraries in the larger LLVM
  Project, such as the Clang expression parser and LLVM disassembler.
 
-Package: liblldb-@LLVM_VERSION@
+Package: liblldb-@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: liblldb-@LLVM_VERSION@
+Breaks: liblldb-@LLVM_VERSION@ (<< ${source:Version})
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: Next generation, high-performance debugger, library
@@ -585,7 +597,7 @@ Package: python3-lldb-@LLVM_VERSION@
 Section: python
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@t64 (= ${binary:Version})
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
 Provides: python3-lldb-x.y
@@ -618,7 +630,7 @@ Description: Next generation, high-performance debugger, header files
 Package: libomp-@LLVM_VERSION@-dev
 Section: libdevel
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
-Depends: libomp5-@LLVM_VERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libomp5-@LLVM_VERSION@t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-@LLVM_VERSION@-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
 Provides: libomp-x.y-dev
@@ -629,14 +641,14 @@ Description: LLVM OpenMP runtime - dev package
  linked against, and that manages the multiple threads in an OpenMP program
  while it is executing.
 
-Package: libomp5-@LLVM_VERSION@
+Package: libomp5-@LLVM_VERSION@t64
 Multi-Arch: same
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libomp5 (<< 44)
-Provides: libomp-x.y
+Breaks: libomp5-@LLVM_VERSION@ (<< ${source:Version}), libomp5 (<< 44)
+Provides: ${t64:Provides}, libomp-x.y
 Conflicts: libomp-x.y
-Replaces: libomp-x.y
+Replaces: libomp5-@LLVM_VERSION@, libomp-x.y
 Description: LLVM OpenMP runtime
  The runtime is the part of the OpenMP implementation that your code is
  linked against, and that manages the multiple threads in an OpenMP program
@@ -658,17 +670,17 @@ Description: LLVM OpenMP runtime - Documentation
 
 # ------------- libcxx -------------
 
-Package: libc++1-@LLVM_VERSION@
+Package: libc++1-@LLVM_VERSION@t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: clang
-Breaks: libc++1 (<< 44)
-Provides: libc++-x.y
+Breaks: libc++1-@LLVM_VERSION@ (<< ${source:Version}), libc++1 (<< 44)
+Provides: ${t64:Provides}, libc++-x.y
 Conflicts: libc++-x.y
-Replaces: libc++-x.y
+Replaces: libc++1-@LLVM_VERSION@, libc++-x.y
 Description: LLVM C++ Standard library
  libc++ is another implementation of the C++ standard library.
  .
@@ -686,7 +698,7 @@ Package: libc++-@LLVM_VERSION@-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends},
+Depends: libc++1-@LLVM_VERSION@t64 (= ${binary:Version}), ${misc:Depends},
  libc++abi-@LLVM_VERSION@-dev (= ${binary:Version}),
  libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44), libc++abi-@LLVM_VERSION@-dev (<< 1:17.0.6-2)
@@ -731,16 +743,16 @@ Description: LLVM C++ Standard library (WASI)
 
 # ------------- libcxxabi -------------
 
-Package: libc++abi1-@LLVM_VERSION@
+Package: libc++abi1-@LLVM_VERSION@t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libc++abi1 (<< 44)
-Provides: libc++abi-x.y
+Breaks: libc++abi1-@LLVM_VERSION@ (<< ${source:Version}), libc++abi1 (<< 44)
+Provides: ${t64:Provides}, libc++abi-x.y
 Conflicts: libc++abi-x.y
-Replaces: libc++abi-x.y
+Replaces: libc++abi1-@LLVM_VERSION@, libc++abi-x.y
 Description: LLVM low level support for a standard C++ library
  libc++abi is another implementation of low level support for a standard C++
  library.
@@ -754,7 +766,7 @@ Package: libc++abi-@LLVM_VERSION@-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++abi1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends}
+Depends: libc++abi1-@LLVM_VERSION@t64 (= ${binary:Version}), ${misc:Depends}
 Breaks: libc++abi-dev (<= 44)
 Provides: libc++abi-x.y-dev
 Conflicts: libc++abi-x.y-dev
@@ -826,15 +838,16 @@ Description: OpenCL C language implementation - development files
 
 # ------------- libunwind -------------
 
-Package: libunwind-@LLVM_VERSION@
+Package: libunwind-@LLVM_VERSION@t64
+Breaks: libunwind-@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libunwind-x.y
+Provides: ${t64:Provides}, libunwind-x.y
 Conflicts: libunwind-x.y
-Replaces: libunwind-x.y
+Replaces: libunwind-@LLVM_VERSION@, libunwind-x.y
 Description: production-quality unwinder
  libunwind is a production-quality unwinder, with platform support for DWARF
  unwind info, SjLj, and ARM EHABI.
@@ -849,7 +862,7 @@ Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libunwind-@LLVM_VERSION@ (= ${binary:Version})
+ libunwind-@LLVM_VERSION@t64 (= ${binary:Version})
 Provides: libunwind-dev, libunwind-x.y-dev
 Conflicts: libunwind-dev, libunwind-x.y-dev
 Replaces: libunwind-dev, libunwind-x.y-dev
@@ -874,15 +887,16 @@ Description: Multi-Level Intermediate Representation tools
  .
  This package provides tools.
 
-Package: libmlir-@LLVM_VERSION@
+Package: libmlir-@LLVM_VERSION@t64
+Breaks: libmlir-@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libmlir-x.y
+Provides: ${t64:Provides}, libmlir-x.y
 Conflicts: libmlir-x.y
-Replaces: libmlir-x.y
+Replaces: libmlir-@LLVM_VERSION@, libmlir-x.y
 Description: Multi-Level Intermediate Representation library
  Novel approach to building reusable and extensible compiler infrastructure.
  MLIR aims to address software fragmentation, improve compilation for
@@ -896,7 +910,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libmlir-@LLVM_VERSION@ (= ${binary:Version})
+ libmlir-@LLVM_VERSION@t64 (= ${binary:Version})
 Breaks: libmlir-dev
 Provides: libmlir-x.y-dev
 Conflicts: libmlir-x.y-dev
diff --git a/debian/libc++1-X.Y.lintian-overrides.in b/debian/libc++1-X.Y.lintian-overrides.in
deleted file mode 100644
index 8e1532d4..00000000
--- a/debian/libc++1-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libc++1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0*
diff --git a/debian/libc++1-X.Y.install.in b/debian/libc++1-X.Yt64.install.in
similarity index 100%
rename from debian/libc++1-X.Y.install.in
rename to debian/libc++1-X.Yt64.install.in
diff --git a/debian/libc++1-X.Y.links.in b/debian/libc++1-X.Yt64.links.in
similarity index 100%
rename from debian/libc++1-X.Y.links.in
rename to debian/libc++1-X.Yt64.links.in
diff --git a/debian/libc++1-X.Yt64.lintian-overrides.in b/debian/libc++1-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..25a325fa
--- /dev/null
+++ b/debian/libc++1-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libc++1-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0*
+libc++1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libc++1-@LLVM_VERSION@
diff --git a/debian/libc++abi1-X.Y.lintian-overrides.in b/debian/libc++abi1-X.Y.lintian-overrides.in
deleted file mode 100644
index 0637b505..00000000
--- a/debian/libc++abi1-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libc++abi1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0*
diff --git a/debian/libc++abi1-X.Y.install.in b/debian/libc++abi1-X.Yt64.install.in
similarity index 100%
rename from debian/libc++abi1-X.Y.install.in
rename to debian/libc++abi1-X.Yt64.install.in
diff --git a/debian/libc++abi1-X.Y.links.in b/debian/libc++abi1-X.Yt64.links.in
similarity index 100%
rename from debian/libc++abi1-X.Y.links.in
rename to debian/libc++abi1-X.Yt64.links.in
diff --git a/debian/libc++abi1-X.Yt64.lintian-overrides.in b/debian/libc++abi1-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..c3100c96
--- /dev/null
+++ b/debian/libc++abi1-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libc++abi1-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0*
+libc++abi1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libc++abi1-@LLVM_VERSION@
diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Yt64.install.in
similarity index 100%
rename from debian/libclang-cppX.Y.install.in
rename to debian/libclang-cppX.Yt64.install.in
diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Yt64.links.in
similarity index 100%
rename from debian/libclang-cppX.Y.links.in
rename to debian/libclang-cppX.Yt64.links.in
diff --git a/debian/libclang-cppX.Yt64.lintian-overrides.in b/debian/libclang-cppX.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..5d4a86a8
--- /dev/null
+++ b/debian/libclang-cppX.Yt64.lintian-overrides.in
@@ -0,0 +1 @@
+libclang-cpp@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang-cpp@LLVM_VERSION@
diff --git a/debian/libclang1-X.Y.lintian-overrides.in b/debian/libclang1-X.Y.lintian-overrides.in
deleted file mode 100644
index 86038455..00000000
--- a/debian/libclang1-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# I know and I am not planning to change that yet.
-libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang-@LLVM_VERSION@-1
-# Provided as transition
-libclang1-@LLVM_VERSION@: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so
-libclang1-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so
diff --git a/debian/libclang1-X.Y.install.in b/debian/libclang1-X.Yt64.install.in
similarity index 100%
rename from debian/libclang1-X.Y.install.in
rename to debian/libclang1-X.Yt64.install.in
diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Yt64.links.in
similarity index 100%
rename from debian/libclang1-X.Y.links.in
rename to debian/libclang1-X.Yt64.links.in
diff --git a/debian/libclang1-X.Yt64.lintian-overrides.in b/debian/libclang1-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..c0e016cc
--- /dev/null
+++ b/debian/libclang1-X.Yt64.lintian-overrides.in
@@ -0,0 +1,6 @@
+# I know and I am not planning to change that yet.
+libclang1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang-@LLVM_VERSION@-1
+# Provided as transition
+libclang1-@LLVM_VERSION@t64: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so
+libclang1-@LLVM_VERSION@t64: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so
+libclang1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang1-@LLVM_VERSION@
diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Yt64.symbols.in
similarity index 99%
rename from debian/libclang1-X.Y.symbols.in
rename to debian/libclang1-X.Yt64.symbols.in
index 2f07205d..35c74c56 100644
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Yt64.symbols.in
@@ -1,4 +1,4 @@
-libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
+libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@t64 #MINVER#
  (optional)LLVM_13@LLVM_13 1:15.0.7-3
  (optional)LLVM_16@LLVM_16 1:16.0.2-1
  (optional)LLVM_17@LLVM_17 1:17.0.1-1
diff --git a/debian/liblldb-X.Y.lintian-overrides.in b/debian/liblldb-X.Y.lintian-overrides.in
deleted file mode 100644
index 180aec35..00000000
--- a/debian/liblldb-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# That is normal. The lib is not (yet?) shipped as a new package
-liblldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@-1
-# For now, override this warning. We might create a -dev at some point
-liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so
-liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb-@LLVM_VERSION@.so.1 usr/lib/*/liblldb-@LLVM_VERSION@.so
diff --git a/debian/liblldb-X.Y.install.in b/debian/liblldb-X.Yt64.install.in
similarity index 100%
rename from debian/liblldb-X.Y.install.in
rename to debian/liblldb-X.Yt64.install.in
diff --git a/debian/liblldb-X.Y.links.in b/debian/liblldb-X.Yt64.links.in
similarity index 100%
rename from debian/liblldb-X.Y.links.in
rename to debian/liblldb-X.Yt64.links.in
diff --git a/debian/liblldb-X.Yt64.lintian-overrides.in b/debian/liblldb-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..02752489
--- /dev/null
+++ b/debian/liblldb-X.Yt64.lintian-overrides.in
@@ -0,0 +1,6 @@
+# That is normal. The lib is not (yet?) shipped as a new package
+liblldb-@LLVM_VERSION@t64: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@t64-1
+# For now, override this warning. We might create a -dev at some point
+liblldb-@LLVM_VERSION@t64: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so
+liblldb-@LLVM_VERSION@t64: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb-@LLVM_VERSION@t64.so.1 usr/lib/*/liblldb-@LLVM_VERSION@t64.so
+liblldb-@LLVM_VERSION@t64: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@
diff --git a/debian/libllvmX.Y.lintian-overrides.in b/debian/libllvmX.Y.lintian-overrides.in
deleted file mode 100644
index 49f7ef24..00000000
--- a/debian/libllvmX.Y.lintian-overrides.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# That is normal. Upstream does not match the debian convention
-libllvm@LLVM_VERSION@: package-name-doesnt-match-sonames libLLVM-@LLVM_VERSION@-1
diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Yt64.install.in
similarity index 100%
rename from debian/libllvmX.Y.install.in
rename to debian/libllvmX.Yt64.install.in
diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Yt64.links.in
similarity index 100%
rename from debian/libllvmX.Y.links.in
rename to debian/libllvmX.Yt64.links.in
diff --git a/debian/libllvmX.Yt64.lintian-overrides.in b/debian/libllvmX.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..40fd72df
--- /dev/null
+++ b/debian/libllvmX.Yt64.lintian-overrides.in
@@ -0,0 +1,3 @@
+# That is normal. Upstream does not match the debian convention
+libllvm@LLVM_VERSION@t64: package-name-doesnt-match-sonames libLLVM-@LLVM_VERSION@-1
+libllvm@LLVM_VERSION@t64: package-name-doesnt-match-sonames libllvm@LLVM_VERSION@
diff --git a/debian/libmlir-X.Y.lintian-overrides.in b/debian/libmlir-X.Y.lintian-overrides.in
deleted file mode 100644
index f2f020ba..00000000
--- a/debian/libmlir-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libmlir-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/*
diff --git a/debian/libmlir-X.Y.install.in b/debian/libmlir-X.Yt64.install.in
similarity index 100%
rename from debian/libmlir-X.Y.install.in
rename to debian/libmlir-X.Yt64.install.in
diff --git a/debian/libmlir-X.Yt64.lintian-overrides.in b/debian/libmlir-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..50568c40
--- /dev/null
+++ b/debian/libmlir-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libmlir-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/*
+libmlir-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libmlir-@LLVM_VERSION@
diff --git a/debian/libomp5-X.Y.lintian-overrides.in b/debian/libomp5-X.Y.lintian-overrides.in
deleted file mode 100644
index 335e58e9..00000000
--- a/debian/libomp5-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libomp5-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5*
diff --git a/debian/libomp5-X.Y.install.in b/debian/libomp5-X.Yt64.install.in
similarity index 100%
rename from debian/libomp5-X.Y.install.in
rename to debian/libomp5-X.Yt64.install.in
diff --git a/debian/libomp5-X.Y.links.in b/debian/libomp5-X.Yt64.links.in
similarity index 100%
rename from debian/libomp5-X.Y.links.in
rename to debian/libomp5-X.Yt64.links.in
diff --git a/debian/libomp5-X.Yt64.lintian-overrides.in b/debian/libomp5-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..0bbf0689
--- /dev/null
+++ b/debian/libomp5-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libomp5-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5*
+libomp5-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libomp5-@LLVM_VERSION@
diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Yt64.symbols.in
similarity index 99%
rename from debian/libomp5-X.Y.symbols.in
rename to debian/libomp5-X.Yt64.symbols.in
index ce0fe517..dcc64e8c 100644
--- a/debian/libomp5-X.Y.symbols.in
+++ b/debian/libomp5-X.Yt64.symbols.in
@@ -1,4 +1,4 @@
-libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
+libomp.so.5 libomp5-@LLVM_VERSION@t64 #MINVER#
  GOMP_1.0@GOMP_1.0 0.20131209
  GOMP_2.0@GOMP_2.0 0.20131209
  GOMP_3.0@GOMP_3.0 0.20131209
diff --git a/debian/libunwind-X.Y.lintian-overrides.in b/debian/libunwind-X.Y.lintian-overrides.in
deleted file mode 100644
index 6cb74223..00000000
--- a/debian/libunwind-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libunwind-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0*
diff --git a/debian/libunwind-X.Y.install.in b/debian/libunwind-X.Yt64.install.in
similarity index 100%
rename from debian/libunwind-X.Y.install.in
rename to debian/libunwind-X.Yt64.install.in
diff --git a/debian/libunwind-X.Y.links.in b/debian/libunwind-X.Yt64.links.in
similarity index 100%
rename from debian/libunwind-X.Y.links.in
rename to debian/libunwind-X.Yt64.links.in
diff --git a/debian/libunwind-X.Yt64.lintian-overrides.in b/debian/libunwind-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..3683dc8c
--- /dev/null
+++ b/debian/libunwind-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libunwind-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0*
+libunwind-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libunwind-@LLVM_VERSION@
diff --git a/debian/rules b/debian/rules
index 1d53d017..db8b6cac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -610,7 +610,7 @@ stamps/preconfigure:
 		debian/libclang-rt-$(LLVM_VERSION)-dev.install \
 		debian/libpolly-$(LLVM_VERSION)-dev.install \
 		debian/libomp-$(LLVM_VERSION)-dev.install \
-		debian/libomp5-$(LLVM_VERSION).install \
+		debian/libomp5-$(LLVM_VERSION)t64.install \
 		debian/llvm-$(LLVM_VERSION)-dev.install \
 		debian/llvm-$(LLVM_VERSION)-linker-tools.install \
 		debian/llvm-$(LLVM_VERSION)-linker-tools.links \
@@ -1298,10 +1298,10 @@ endif
 
 
 override_dh_makeshlibs:
-	dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION)
-	dh_makeshlibs -pliblldb-$(LLVM_VERSION)
-	dh_makeshlibs -plibllvm$(LLVM_VERSION)
-	dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION)
+	dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION)t64
+	dh_makeshlibs -pliblldb-$(LLVM_VERSION)t64
+	dh_makeshlibs -plibllvm$(LLVM_VERSION)t64
+	dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64
 	dh_makeshlibs --remaining-packages -V
 
 override_dh_shlibdeps:
@@ -1322,10 +1322,10 @@ override_dh_strip:
 	find $(TARGET_BUILD) -name '*.o' -o -name '*.a' -type f | xargs -r rm -f
 ifeq (0, $(strip $(shell dpkg --compare-versions $(DH_VERSION) ge 9.20160114; echo $$?)))
 	: # If we don't have the right version of debhelper, don't run the option
-	dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg'
-	dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg'
-	dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg'
-	dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg'
+	dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION)t64 --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)t64-dbg'
+	dh_strip -p libllvm$(LLVM_VERSION)t64 --dbgsym-migration='libllvm$(LLVM_VERSION)t64-dbg'
+	dh_strip -p liblldb-$(LLVM_VERSION)t64 --dbgsym-migration='liblldb-$(LLVM_VERSION)t64-dbg'
+	dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64 --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64-dbg'
 endif
 # ifeq (${LLD_ENABLE},yes)
 # 	PATH=$(CURDIR)/:$$PATH dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(LLVM_VERSION)-dbg