diff --git a/debian/changelog b/debian/changelog
index 6e5fb2c0..3d3f8c1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 llvm-toolchain-13 (1:13.0.0-6) unstable; urgency=medium
 
   * Remove omp-device-info from LLVMExports.cmake (Closes: #996551)
+  * Fix a atomic issue. Thanks to YunQiang Su for the patch
+    Partial fix for #995827
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 15 Oct 2021 10:45:30 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 96823ec0..c3b92fbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -145,3 +145,4 @@ scan-build-py-fix-default-bin.diff
 libclc-llvm-spirv.diff
 omp-riscv64.patch
 test-disable-lldb-i386.diff
+unbreak-atomic-arm.diff
diff --git a/debian/patches/unbreak-atomic-arm.diff b/debian/patches/unbreak-atomic-arm.diff
new file mode 100644
index 00000000..5a4fc884
--- /dev/null
+++ b/debian/patches/unbreak-atomic-arm.diff
@@ -0,0 +1,19 @@
+Index: llvm-toolchain-13-13.0.0/compiler-rt/lib/scudo/standalone/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-13-13.0.0.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt
++++ llvm-toolchain-13-13.0.0/compiler-rt/lib/scudo/standalone/CMakeLists.txt
+@@ -137,6 +137,13 @@ append_list_if(COMPILER_RT_HAS_LIBPTHREA
+
+ append_list_if(FUCHSIA zircon SCUDO_LINK_LIBS)
+
++if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips" OR
++   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64" OR
++   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mipsel" OR
++   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64el")
++  list(APPEND SCUDO_LINK_LIBS atomic)
++endif()
++
+ if(COMPILER_RT_HAS_SCUDO_STANDALONE)
+   add_compiler_rt_object_libraries(RTScudoStandalone
+     ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
+