diff --git a/debian/changelog b/debian/changelog
index 371a091e..839a3f94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 llvm-toolchain-15 (1:15.0.3-1~exp3) experimental; urgency=medium
 
   * Bring back LTO
+  * Cherry-pick upstream fix to unbreak mips (closes: #1022169)
+    Thanks to YunQiang Su for the patch
+    https://reviews.llvm.org/D135553
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 22 Oct 2022 15:48:48 +0200
 
diff --git a/debian/patches/mips/mips-assert-size.diff b/debian/patches/mips/mips-assert-size.diff
new file mode 100644
index 00000000..1d21e29b
--- /dev/null
+++ b/debian/patches/mips/mips-assert-size.diff
@@ -0,0 +1,19 @@
+Index: llvm-toolchain-15_15.0.3~++20221019061539+4a2c05b05ed0/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cpp
+===================================================================
+--- llvm-toolchain-15_15.0.3~++20221019061539+4a2c05b05ed0.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cpp
++++ llvm-toolchain-15_15.0.3~++20221019061539+4a2c05b05ed0/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cpp
+@@ -64,9 +64,12 @@ using namespace __sanitizer;
+ COMPILER_CHECK(struct___old_kernel_stat_sz == sizeof(struct __old_kernel_stat));
+ #endif
+ 
+-COMPILER_CHECK(struct_kernel_stat_sz == sizeof(struct stat));
++#  if defined(__LP64__) || \
++      (!defined(_LARGEFILE_SOURCE) && _FILE_OFFSET_BITS != 64)
++ COMPILER_CHECK(struct_kernel_stat_sz == sizeof(struct stat));
++#  endif
+ 
+-#if defined(__i386__)
++#  if defined(__i386__)
+ COMPILER_CHECK(struct_kernel_stat64_sz == sizeof(struct stat64));
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index aed1635c..ba33665d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -154,3 +154,4 @@ fix-typo-1018770.diff
 bolt.patch
 bolt-disable-emit-relocs.patch
 D124841-fix-powerpc-miscompile.patch
+mips/mips-assert-size.diff