diff --git a/debian/changelog b/debian/changelog
index 082859a6..dee2baf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,20 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 25 Jan 2024 14:51:10 +0100
 
+llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; urgency=medium
+
+  [ John Paul Adrian Glaubitz ]
+  * Install *clang_rt* on sparc and sparc64
+  * Run chrpath for libclang on sparc and sparc64
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Fri, 16 Feb 2024 09:53:15 +0100
+
+llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium
+
+  * Add abi=+time64,+lfs only on 64bits system
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 11 Feb 2024 14:29:31 +0100
+
 llvm-toolchain-18 (1:18.1.0~rc2-2) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/debian/rules b/debian/rules
index 459f56c0..a5820140 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,12 @@ CONFIGURE_EXTRA =
 # dpkg-buildflags support
 # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto
 # remove +time64,+lfs once the time64_t transition starts
-export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto abi=+time64,+lfs
+export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto
+
+ifeq ($(DEB_BUILD_ARCH_BITS),64)
+    export DEB_BUILD_MAINT_OPTIONS += abi=+time64,+lfs
+endif
+
 
 # these are handled on a per stage / build basis
 ifeq ($(VENDOR)-$(DEB_HOST_ARCH),Ubuntu-ppc64el)
@@ -582,6 +587,7 @@ stamps/preconfigure:
 	@echo "DEB_HOST_ARCH_BITS=$(DEB_HOST_ARCH_BITS)"
 	@echo "DEB_HOST_ARCH=$(DEB_HOST_ARCH)"
 	@echo "DEB_HOST_ARCH_OS=$(DEB_HOST_ARCH_OS)"
+	@echo "DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS)"
 	@echo "DISTRO=$(DISTRO)"
 	@echo "GCC_VERSION=$(GCC_VERSION)"
 	@echo "PROJECTS=$(PROJECTS_LIST)"