diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index da7d99247..710f7fd54 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -19,6 +19,8 @@ Other improvements
 
 For distributors
 ----------------
+- Fixed build on MIPS machines (:issue:`11965`).
+- Fixed broken universal variables on Cygwin (:issue:`11948`).
 
 
 fish 4.1.3 (released ???)
diff --git a/src/signal.rs b/src/signal.rs
index 2ee410998..0c1930044 100644
--- a/src/signal.rs
+++ b/src/signal.rs
@@ -417,7 +417,15 @@ macro_rules! signal_entry {
     #[cfg(any(apple, bsd))]
     signal_entry!(SIGINFO, SIGINFO_DESC),
 
-    #[cfg(target_os = "linux")]
+    #[cfg(all(
+        target_os = "linux",
+        not(any(
+            target_arch = "mips",
+            target_arch = "mips32r6",
+            target_arch = "mips64",
+            target_arch = "mips64r6",
+        ))
+    ))]
     signal_entry!(SIGSTKFLT, SIGSTKFLT_DESC),
 
     #[cfg(target_os = "linux")]