diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3739725f4..8220fd3c4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -25,8 +25,7 @@ Other improvements
 For distributors
 ----------------
 - The minimum supported Rust version (MSRV) has been updated to 1.85.
-- Fixed build on MIPS machines (:issue:`11965`).
-- Fixed broken universal variables on Cygwin (:issue:`11948`).
+- Fixed saving/loading of universal variables on Cygwin (:issue:`11948`).
 
 
 fish 4.1.3 (released ???)
@@ -36,6 +35,7 @@ This release fixes the following regressions identified in 4.1.0:
 
 - Crash on invalid :doc:`function <cmds/function>` command (:issue:`11912`).
 - Fixed the fish ``man`` function for the commands ``!`` ``.`` ``:`` ``[`` (:issue:`11955`).
+- Fixed build on Illumos (:issue:`11982`).
 
 as well as the following regressions identified in 4.0.0:
 
diff --git a/crates/gettext-maps/build.rs b/crates/gettext-maps/build.rs
index 4e08cf6c9..9675e59a7 100644
--- a/crates/gettext-maps/build.rs
+++ b/crates/gettext-maps/build.rs
@@ -1,7 +1,7 @@
 use std::{
     ffi::OsStr,
     path::{Path, PathBuf},
-    process::{Command, Stdio},
+    process::Command,
 };
 
 use fish_build_helper::env_var;
@@ -35,11 +35,7 @@ fn embed_localizations(cache_dir: &Path) {
     // for the respective language.
     let mut catalogs = phf_codegen::Map::new();
 
-    match Command::new("msgfmt")
-        .arg("-h")
-        .stdout(Stdio::null())
-        .status()
-    {
+    match Command::new("msgfmt").arg("-h").output() {
         Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
             rsconf::warn!(
                 "Cannot find msgfmt to build gettext message catalogs. Localization will not work."
@@ -54,7 +50,9 @@ fn embed_localizations(cache_dir: &Path) {
         Err(e) => {
             panic!("Error when trying to run `msgfmt -h`: {e:?}");
         }
-        Ok(_) => {
+        Ok(output) => {
+            let has_check_format =
+                String::from_utf8_lossy(&output.stdout).contains("--check-format");
             for dir_entry_result in po_dir.read_dir().unwrap() {
                 let dir_entry = dir_entry_result.unwrap();
                 let po_file_path = dir_entry.path();
@@ -96,12 +94,16 @@ fn embed_localizations(cache_dir: &Path) {
                 // Generate the map file.
 
                 // Try to create new MO data and load it into `mo_data`.
-                let output = Command::new("msgfmt")
-                    .arg("--check-format")
-                    .arg("--output-file=-")
-                    .arg(&po_file_path)
-                    .output()
-                    .unwrap();
+                let output = {
+                    let mut cmd = &mut Command::new("msgfmt");
+                    if has_check_format {
+                        cmd = cmd.arg("--check-format");
+                    }
+                    cmd.arg("--output-file=-")
+                        .arg(&po_file_path)
+                        .output()
+                        .unwrap()
+                };
                 if !output.status.success() {
                     panic!(
                         "msgfmt failed:\n{}",