diff --git a/debian/changelog b/debian/changelog
index ec2d04d4..84c7be19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-13 (1:13.0.1-6) UNRELEASED; urgency=medium
+
+  [ John Paul Adrian Glaubitz ]
+  * Disable compiler-rt built-ins on x32
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Wed, 01 Jun 2022 07:37:04 +0200
+
 llvm-toolchain-13 (1:13.0.1-5) unstable; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
diff --git a/debian/rules b/debian/rules
index cee0a7fd..e5d8cc21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -195,6 +195,9 @@ endif
 ifneq (,$(filter $(DEB_HOST_ARCH),x32))
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=x86_64-linux-gnux32
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-linux-gnux32
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
+  COMPILER_RT_USE_BUILTINS_LIBRARY := OFF
+  LIBCXX_USE_COMPILER_RT := OFF
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),hurd-i386))