diff --git a/crates/bashkit/src/builtins/generated/cat_args.rs b/crates/bashkit/src/builtins/generated/cat_args.rs
index 0511201db..c24908f80 100644
--- a/crates/bashkit/src/builtins/generated/cat_args.rs
+++ b/crates/bashkit/src/builtins/generated/cat_args.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uu/cat/
+// Source: uutils/coreutils@8613dffab src/uu/cat/
 // Regenerate: cargo run -p bashkit-coreutils-port -- <UUTILS_DIR> cat <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
diff --git a/crates/bashkit/src/builtins/generated/extendedbigdecimal.rs b/crates/bashkit/src/builtins/generated/extendedbigdecimal.rs
index a7effb0a9..77f7713c2 100644
--- a/crates/bashkit/src/builtins/generated/extendedbigdecimal.rs
+++ b/crates/bashkit/src/builtins/generated/extendedbigdecimal.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uucore/src/lib/features/extendedbigdecimal.rs
+// Source: uutils/coreutils@8613dffab src/uucore/src/lib/features/extendedbigdecimal.rs
 // Regenerate: cargo run -p bashkit-coreutils-port -- port-module <UUTILS_DIR> format <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
@@ -147,14 +147,10 @@ impl Add for ExtendedBigDecimal {
     fn add(self, other: Self) -> Self {
         match (self, other) {
             (Self::BigDecimal(m), Self::BigDecimal(n)) => Self::BigDecimal(m.add(n)),
-            (Self::BigDecimal(_), Self::MinusInfinity)
-            | (Self::MinusInfinity, Self::BigDecimal(_))
-            | (Self::MinusInfinity, Self::MinusInfinity)
-            | (Self::MinusInfinity, Self::MinusZero) => Self::MinusInfinity,
-            (Self::BigDecimal(_), Self::Infinity)
-            | (Self::Infinity, Self::BigDecimal(_))
-            | (Self::Infinity, Self::Infinity)
-            | (Self::Infinity, Self::MinusZero) => Self::Infinity,
+            (Self::BigDecimal(_) | Self::MinusInfinity, Self::MinusInfinity)
+            | (Self::MinusInfinity, Self::BigDecimal(_) | Self::MinusZero) => Self::MinusInfinity,
+            (Self::BigDecimal(_) | Self::Infinity, Self::Infinity)
+            | (Self::Infinity, Self::BigDecimal(_) | Self::MinusZero) => Self::Infinity,
             (Self::BigDecimal(m), Self::MinusZero) => Self::BigDecimal(m),
             (Self::Infinity, Self::MinusInfinity)
             | (Self::MinusInfinity, Self::Infinity)
@@ -169,22 +165,12 @@ impl PartialEq for ExtendedBigDecimal {
     fn eq(&self, other: &Self) -> bool {
         match (self, other) {
             (Self::BigDecimal(m), Self::BigDecimal(n)) => m.eq(n),
-            (Self::BigDecimal(_), Self::MinusInfinity)
-            | (Self::BigDecimal(_), Self::Infinity)
-            | (Self::BigDecimal(_), Self::MinusZero)
-            | (Self::Infinity, Self::BigDecimal(_))
-            | (Self::Infinity, Self::MinusZero)
-            | (Self::Infinity, Self::MinusInfinity)
-            | (Self::MinusInfinity, Self::BigDecimal(_))
-            | (Self::MinusInfinity, Self::Infinity)
-            | (Self::MinusInfinity, Self::MinusZero)
-            | (Self::MinusZero, Self::BigDecimal(_))
-            | (Self::MinusZero, Self::Infinity)
-            | (Self::MinusZero, Self::MinusInfinity)
-            | (Self::Nan, _)
-            | (Self::MinusNan, _)
-            | (_, Self::Nan)
-            | (_, Self::MinusNan) => false,
+            (Self::BigDecimal(_) | Self::Infinity | Self::MinusZero, Self::MinusInfinity)
+            | (Self::BigDecimal(_) | Self::MinusInfinity | Self::MinusZero, Self::Infinity)
+            | (Self::BigDecimal(_) | Self::Infinity | Self::MinusInfinity, Self::MinusZero)
+            | (Self::Infinity | Self::MinusInfinity | Self::MinusZero, Self::BigDecimal(_))
+            | (Self::Nan | Self::MinusNan, _)
+            | (_, Self::Nan | Self::MinusNan) => false,
             (Self::Infinity, Self::Infinity)
             | (Self::MinusInfinity, Self::MinusInfinity)
             | (Self::MinusZero, Self::MinusZero) => true,
@@ -195,22 +181,16 @@ impl PartialOrd for ExtendedBigDecimal {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         match (self, other) {
             (Self::BigDecimal(m), Self::BigDecimal(n)) => m.partial_cmp(n),
-            (Self::BigDecimal(_), Self::MinusInfinity)
-            | (Self::Infinity, Self::BigDecimal(_))
-            | (Self::Infinity, Self::MinusZero)
-            | (Self::Infinity, Self::MinusInfinity)
-            | (Self::MinusZero, Self::MinusInfinity) => Some(Ordering::Greater),
-            (Self::BigDecimal(_), Self::Infinity)
-            | (Self::MinusInfinity, Self::BigDecimal(_))
-            | (Self::MinusInfinity, Self::Infinity)
-            | (Self::MinusInfinity, Self::MinusZero)
-            | (Self::MinusZero, Self::Infinity) => Some(Ordering::Less),
+            (Self::BigDecimal(_) | Self::Infinity | Self::MinusZero, Self::MinusInfinity)
+            | (Self::Infinity, Self::BigDecimal(_) | Self::MinusZero) => Some(Ordering::Greater),
+            (Self::BigDecimal(_) | Self::MinusInfinity | Self::MinusZero, Self::Infinity)
+            | (Self::MinusInfinity, Self::BigDecimal(_) | Self::MinusZero) => Some(Ordering::Less),
             (Self::BigDecimal(m), Self::MinusZero) => m.partial_cmp(&BigDecimal::zero()),
             (Self::Infinity, Self::Infinity)
             | (Self::MinusZero, Self::MinusZero)
             | (Self::MinusInfinity, Self::MinusInfinity) => Some(Ordering::Equal),
             (Self::MinusZero, Self::BigDecimal(n)) => BigDecimal::zero().partial_cmp(n),
-            (Self::Nan, _) | (Self::MinusNan, _) | (_, Self::Nan) | (_, Self::MinusNan) => None,
+            (Self::Nan | Self::MinusNan, _) | (_, Self::Nan | Self::MinusNan) => None,
         }
     }
 }
diff --git a/crates/bashkit/src/builtins/generated/format/argument.rs b/crates/bashkit/src/builtins/generated/format/argument.rs
index dfc7f85b4..2b1ddf304 100644
--- a/crates/bashkit/src/builtins/generated/format/argument.rs
+++ b/crates/bashkit/src/builtins/generated/format/argument.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uucore/src/lib/features/format/argument.rs
+// Source: uutils/coreutils@8613dffab src/uucore/src/lib/features/format/argument.rs
 // Regenerate: cargo run -p bashkit-coreutils-port -- port-module <UUTILS_DIR> format <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
@@ -104,7 +104,7 @@ impl<'a> FormatArguments<'a> {
         let Ok(s) = os_str_as_bytes(os) else {
             return Err(ExtendedParserError::NotNumeric);
         };
-        let (Some((b'"', bytes)) | Some((b'\'', bytes))) = s.split_first() else {
+        let Some((b'"' | b'\'', bytes)) = s.split_first() else {
             debug_assert!(false);
             return Err(ExtendedParserError::NotNumeric);
         };
@@ -170,26 +170,27 @@ fn extract_value<T: Default>(
     match p {
         Ok(v) => v,
         Err(e) => {
-            set_exit_code(1);
-            let input = locale_aware_escape_name(OsStr::new(input), QuotingStyle::C_NO_QUOTES);
+            let input = locale_aware_escape_name(OsStr::new(input), QuotingStyle::Escape);
             match e {
                 ExtendedParserError::Overflow(v) | ExtendedParserError::Underflow(v) => {
+                    set_exit_code(1);
                     show_error!("{}: Numerical result out of range", input.quote());
                     v
                 }
                 ExtendedParserError::NotNumeric => {
+                    set_exit_code(1);
                     show_error!("{}: expected a numeric value", input.quote());
                     Default::default()
                 }
                 ExtendedParserError::PartialMatch(v, rest) => {
                     if quote_start {
-                        set_exit_code(0);
                         if ::std::option::Option::<::std::ffi::OsString>::None.is_none() {
                             show_warning!(
                                 "{rest}: character(s) following character constant have been ignored"
                             );
                         }
                     } else {
+                        set_exit_code(1);
                         show_error!("{}: value not completely converted", input.quote());
                     }
                     v
diff --git a/crates/bashkit/src/builtins/generated/format/escape.rs b/crates/bashkit/src/builtins/generated/format/escape.rs
index 3feb41d26..4e348219b 100644
--- a/crates/bashkit/src/builtins/generated/format/escape.rs
+++ b/crates/bashkit/src/builtins/generated/format/escape.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uucore/src/lib/features/format/escape.rs
+// Source: uutils/coreutils@8613dffab src/uucore/src/lib/features/format/escape.rs
 // Regenerate: cargo run -p bashkit-coreutils-port -- port-module <UUTILS_DIR> format <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
@@ -25,6 +25,19 @@ pub enum OctalParsing {
     ThreeDigits = 3,
 }
 #[derive(Clone, Copy)]
+pub enum EscapeSet {
+    /// Interpret `\"`, `\u` and `\U` on top of the shared sequences.
+    WithUnicodeAndQuote,
+    /// Only the shared sequences. `\"`, `\u` and `\U` are not escape sequences
+    /// and are emitted with their backslash, like any other unknown escape.
+    WithoutUnicodeAndQuote,
+}
+impl EscapeSet {
+    fn has_unicode_and_quote(self) -> bool {
+        matches!(self, Self::WithUnicodeAndQuote)
+    }
+}
+#[derive(Clone, Copy)]
 enum Base {
     Oct(OctalParsing),
     Hex,
@@ -99,6 +112,7 @@ pub enum EscapeError {
 pub fn parse_escape_code(
     rest: &mut &[u8],
     zero_octal_parsing: OctalParsing,
+    escape_set: EscapeSet,
 ) -> Result<EscapedChar, FormatError> {
     if let [c, new_rest @ ..] = rest {
         if let b'1'..=b'7' = c
@@ -109,7 +123,7 @@ pub fn parse_escape_code(
         *rest = new_rest;
         match c {
             b'\\' => Ok(EscapedChar::Byte(b'\\')),
-            b'"' => Ok(EscapedChar::Byte(b'"')),
+            b'"' if escape_set.has_unicode_and_quote() => Ok(EscapedChar::Byte(b'"')),
             b'a' => Ok(EscapedChar::Byte(b'\x07')),
             b'b' => Ok(EscapedChar::Byte(b'\x08')),
             b'c' => Ok(EscapedChar::End),
@@ -129,14 +143,14 @@ pub fn parse_escape_code(
             b'0' => Ok(EscapedChar::Byte(
                 parse_code(rest, Base::Oct(zero_octal_parsing)).unwrap_or(b'\0'),
             )),
-            b'u' => match parse_unicode(rest, 4) {
+            b'u' if escape_set.has_unicode_and_quote() => match parse_unicode(rest, 4) {
                 Ok(c) => Ok(EscapedChar::Char(c)),
                 Err(EscapeError::MissingHexadecimalNumber) => Err(FormatError::MissingHex(None)),
                 Err(EscapeError::InvalidCharacters(chars)) => {
                     Err(FormatError::InvalidCharacter('u', chars, None))
                 }
             },
-            b'U' => match parse_unicode(rest, 8) {
+            b'U' if escape_set.has_unicode_and_quote() => match parse_unicode(rest, 8) {
                 Ok(c) => Ok(EscapedChar::Char(c)),
                 Err(EscapeError::MissingHexadecimalNumber) => Err(FormatError::MissingHex(None)),
                 Err(EscapeError::InvalidCharacters(chars)) => {
diff --git a/crates/bashkit/src/builtins/generated/format/human.rs b/crates/bashkit/src/builtins/generated/format/human.rs
index 8adc53b59..046201d84 100644
--- a/crates/bashkit/src/builtins/generated/format/human.rs
+++ b/crates/bashkit/src/builtins/generated/format/human.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uucore/src/lib/features/format/human.rs
+// Source: uutils/coreutils@8613dffab src/uucore/src/lib/features/format/human.rs
 // Regenerate: cargo run -p bashkit-coreutils-port -- port-module <UUTILS_DIR> format <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
diff --git a/crates/bashkit/src/builtins/generated/format/mod.rs b/crates/bashkit/src/builtins/generated/format/mod.rs
index bf2999e00..7afb29ab3 100644
--- a/crates/bashkit/src/builtins/generated/format/mod.rs
+++ b/crates/bashkit/src/builtins/generated/format/mod.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uucore/src/lib/features/format/mod.rs
+// Source: uutils/coreutils@8613dffab src/uucore/src/lib/features/format/mod.rs
 // Regenerate: cargo run -p bashkit-coreutils-port -- port-module <UUTILS_DIR> format <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
@@ -36,6 +36,7 @@ mod escape;
 pub mod human;
 pub mod num_format;
 mod spec;
+pub use self::escape::EscapeSet;
 pub use self::escape::EscapedChar;
 pub use self::escape::OctalParsing;
 use self::escape::parse_escape_code;
@@ -238,9 +239,13 @@ pub fn parse_spec_and_escape(
             let start = fmt.len() - current.len();
             current = rest;
             Some(
-                parse_escape_code(&mut current, OctalParsing::default())
-                    .map(FormatItem::Char)
-                    .map_err(|e| e.spanned(start..fmt.len() - current.len())),
+                parse_escape_code(
+                    &mut current,
+                    OctalParsing::default(),
+                    EscapeSet::WithUnicodeAndQuote,
+                )
+                .map(FormatItem::Char)
+                .map_err(|e| e.spanned(start..fmt.len() - current.len())),
             )
         }
         [c, rest @ ..] => {
@@ -278,6 +283,7 @@ pub fn parse_spec_only(
 pub fn parse_escape_only(
     fmt: &[u8],
     zero_octal_parsing: OctalParsing,
+    escape_set: EscapeSet,
 ) -> impl Iterator<Item = EscapedChar> + '_ {
     let mut current = fmt;
     std::iter::from_fn(move || match current {
@@ -285,7 +291,7 @@ pub fn parse_escape_only(
         [b'\\', rest @ ..] => {
             current = rest;
             Some(
-                parse_escape_code(&mut current, zero_octal_parsing)
+                parse_escape_code(&mut current, zero_octal_parsing, escape_set)
                     .unwrap_or(EscapedChar::Backslash(b'x')),
             )
         }
diff --git a/crates/bashkit/src/builtins/generated/format/num_format.rs b/crates/bashkit/src/builtins/generated/format/num_format.rs
index cb3ac3eb8..54eaf6ecc 100644
--- a/crates/bashkit/src/builtins/generated/format/num_format.rs
+++ b/crates/bashkit/src/builtins/generated/format/num_format.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uucore/src/lib/features/format/num_format.rs
+// Source: uutils/coreutils@8613dffab src/uucore/src/lib/features/format/num_format.rs
 // Regenerate: cargo run -p bashkit-coreutils-port -- port-module <UUTILS_DIR> format <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
@@ -319,6 +319,14 @@ fn zero_pad_to(s: &str, width: usize) -> String {
         padded
     }
 }
+fn zero_with_fraction_digits(precision: usize) -> String {
+    if precision == 0 {
+        return String::from("0");
+    }
+    let mut s = String::from("0.");
+    s.extend(std::iter::repeat_n('0', precision));
+    s
+}
 fn get_sign_indicator(sign: PositiveSign, negative: bool) -> String {
     if negative {
         String::from("-")
@@ -344,6 +352,22 @@ fn format_float_non_finite(e: &ExtendedBigDecimal, case: Case) -> String {
     }
     s
 }
+const MAX_FMT_PRECISION: usize = u16::MAX as usize;
+fn integer_digits(bd: &BigDecimal) -> Option<String> {
+    let (bi, scale) = bd.as_bigint_and_scale();
+    if scale > 0 {
+        return None;
+    }
+    if bi.is_zero() {
+        return Some(String::from("0"));
+    }
+    let zeros = usize::try_from(scale.unsigned_abs())
+        .ok()
+        .filter(|zeros| *zeros <= super::MAX_FORMAT_WIDTH)?;
+    let mut s = bi.to_str_radix(10);
+    s.extend(std::iter::repeat_n('0', zeros));
+    Some(s)
+}
 fn format_float_decimal(
     bd: &BigDecimal,
     precision: Option<usize>,
@@ -352,12 +376,25 @@ fn format_float_decimal(
     debug_assert!(!bd.is_negative());
     let precision = precision.unwrap_or(6);
     if precision == 0 {
-        let (bi, scale) = bd.as_bigint_and_scale();
-        if scale == 0 && force_decimal != ForceDecimal::Yes {
-            return bi.to_str_radix(10);
-        } else if force_decimal == ForceDecimal::Yes {
-            return format!("{bd:.0}.");
-        }
+        let s = integer_digits(bd).unwrap_or_else(|| format!("{bd:.0}"));
+        return if force_decimal == ForceDecimal::Yes {
+            format!("{s}.")
+        } else {
+            s
+        };
+    }
+    let digits = usize::try_from(bd.fractional_digit_count().max(0)).unwrap_or(usize::MAX);
+    let written = digits.min(MAX_FMT_PRECISION);
+    if precision > written {
+        let mut s = if written > 0 {
+            format!("{bd:.written$}")
+        } else if let Some(s) = integer_digits(bd) {
+            s + "."
+        } else {
+            return format!("{bd:.0}");
+        };
+        s.extend(std::iter::repeat_n('0', precision - written));
+        return s;
     }
     format!("{bd:.precision$}")
 }
@@ -389,7 +426,7 @@ fn format_float_scientific(
         return if force_decimal == ForceDecimal::Yes && precision == 0 {
             format!("0.{exp_char}+00")
         } else {
-            format!("{:.precision$}{exp_char}+00", 0.0)
+            format!("{}{exp_char}+00", zero_with_fraction_digits(precision))
         };
     }
     let (digits, exponent) = bd_to_string_exp_with_prec(bd, precision + 1);
@@ -414,7 +451,7 @@ fn format_float_shortest(
     if BigDecimal::zero().eq(bd) {
         return match (force_decimal, precision) {
             (ForceDecimal::Yes, 1) => "0.".into(),
-            (ForceDecimal::Yes, _) => format!("{:.*}", precision - 1, 0.0),
+            (ForceDecimal::Yes, _) => zero_with_fraction_digits(precision - 1),
             (ForceDecimal::No, _) => "0".into(),
         };
     }
@@ -470,9 +507,12 @@ fn format_float_hexadecimal(
     };
     if BigDecimal::zero().eq(bd) {
         return if force_decimal == ForceDecimal::Yes && precision.unwrap_or(0) == 0 {
-            format!("0x0.{exp_char}+0")
+            format!("{prefix}0.{exp_char}+0")
         } else {
-            format!("0x{:.*}{exp_char}+0", precision.unwrap_or(0), 0.0)
+            format!(
+                "{prefix}{}{exp_char}+0",
+                zero_with_fraction_digits(precision.unwrap_or(0))
+            )
         };
     }
     let (frac10, p) = bd.as_bigint_and_exponent();
diff --git a/crates/bashkit/src/builtins/generated/format/spec.rs b/crates/bashkit/src/builtins/generated/format/spec.rs
index 0f1b42d07..fa108b1bb 100644
--- a/crates/bashkit/src/builtins/generated/format/spec.rs
+++ b/crates/bashkit/src/builtins/generated/format/spec.rs
@@ -1,10 +1,11 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uucore/src/lib/features/format/spec.rs
+// Source: uutils/coreutils@8613dffab src/uucore/src/lib/features/format/spec.rs
 // Regenerate: cargo run -p bashkit-coreutils-port -- port-module <UUTILS_DIR> format <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
 
+use super::EscapeSet;
 use super::ExtendedBigDecimal;
 use super::FormatChar;
 use super::FormatError;
@@ -21,8 +22,7 @@ use super::num_format::Prefix;
 use super::num_format::UnsignedIntVariant;
 use super::parse_escape_only;
 use crate::builtins::generated::format::FormatArguments;
-use crate::builtins::generated::format_support::QuotingStyle;
-use crate::builtins::generated::format_support::locale_aware_escape_name;
+use crate::builtins::generated::format_support::locale_aware_shell_escape;
 use crate::builtins::generated::format_support::os_str_as_bytes;
 use std::io::Write;
 use std::num::NonZero;
@@ -335,7 +335,11 @@ impl Spec {
                 let os_str = args.next_string(*position);
                 let bytes = os_str_as_bytes(os_str)?;
                 let mut parsed = Vec::<u8>::new();
-                for c in parse_escape_only(bytes, OctalParsing::ThreeDigits) {
+                for c in parse_escape_only(
+                    bytes,
+                    OctalParsing::ThreeDigits,
+                    EscapeSet::WithUnicodeAndQuote,
+                ) {
                     match c.write(&mut parsed)? {
                         ControlFlow::Continue(()) => {}
                         ControlFlow::Break(()) => {
@@ -347,12 +351,8 @@ impl Spec {
                 writer.write_all(&parsed).map_err(FormatError::IoError)
             }
             Self::QuotedString { position } => {
-                let s = locale_aware_escape_name(
-                    args.next_string(*position),
-                    QuotingStyle::SHELL_ESCAPE,
-                );
-                let bytes = os_str_as_bytes(&s)?;
-                writer.write_all(bytes).map_err(FormatError::IoError)
+                let s = locale_aware_shell_escape(args.next_string(*position));
+                writer.write_all(s.as_bytes()).map_err(FormatError::IoError)
             }
             Self::SignedInt {
                 width,
diff --git a/crates/bashkit/src/builtins/generated/ls_args.rs b/crates/bashkit/src/builtins/generated/ls_args.rs
index d1f3c7553..6bf273c6b 100644
--- a/crates/bashkit/src/builtins/generated/ls_args.rs
+++ b/crates/bashkit/src/builtins/generated/ls_args.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uu/ls/
+// Source: uutils/coreutils@8613dffab src/uu/ls/
 // Regenerate: cargo run -p bashkit-coreutils-port -- <UUTILS_DIR> ls <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
@@ -165,7 +165,6 @@ pub fn ls_command() -> Command {
                     options::format::LONG,
                     options::format::ACROSS,
                     options::format::COLUMNS,
-                    options::DIRED,
                 ]),
         )
         .arg(
@@ -256,8 +255,7 @@ pub fn ls_command() -> Command {
                         "generate output designed for Emacs' dired (Directory Editor) mode",
                     ),
                 )
-                .action(ArgAction::SetTrue)
-                .overrides_with(options::HYPERLINK),
+                .action(ArgAction::SetTrue),
         )
         .arg(
             Arg::new(options::HYPERLINK)
@@ -274,8 +272,7 @@ pub fn ls_command() -> Command {
                 .num_args(0..=1)
                 .default_missing_value("always")
                 .default_value("never")
-                .value_name("WHEN")
-                .overrides_with(options::DIRED),
+                .value_name("WHEN"),
         )
         .arg(
             Arg::new(options::format::ONE_LINE)
@@ -321,7 +318,8 @@ pub fn ls_command() -> Command {
                         PossibleValue::new("shell-always"),
                         PossibleValue::new("shell-escape-always"),
                         PossibleValue::new("clocale"),
-                        PossibleValue::new("c").alias("c-maybe"),
+                        PossibleValue::new("c"),
+                        PossibleValue::new("c-maybe"),
                         PossibleValue::new("escape"),
                     ]),
                 )
diff --git a/crates/bashkit/src/builtins/generated/mktemp_args.rs b/crates/bashkit/src/builtins/generated/mktemp_args.rs
index 652f64ef6..c036eb679 100644
--- a/crates/bashkit/src/builtins/generated/mktemp_args.rs
+++ b/crates/bashkit/src/builtins/generated/mktemp_args.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uu/mktemp/
+// Source: uutils/coreutils@8613dffab src/uu/mktemp/
 // Regenerate: cargo run -p bashkit-coreutils-port -- <UUTILS_DIR> mktemp <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
diff --git a/crates/bashkit/src/builtins/generated/mod.rs b/crates/bashkit/src/builtins/generated/mod.rs
index 7787199c6..237d7f2d5 100644
--- a/crates/bashkit/src/builtins/generated/mod.rs
+++ b/crates/bashkit/src/builtins/generated/mod.rs
@@ -26,7 +26,7 @@
 // and at test time (the invariant assertion). Nothing in the lib's
 // runtime path needs it, hence `allow(dead_code)`.
 #[allow(dead_code)]
-pub const UUTILS_REVISION: &str = "6579cc2";
+pub const UUTILS_REVISION: &str = "8613dffab";
 
 pub mod cat_args;
 #[allow(clippy::collapsible_if, clippy::unwrap_used)]
diff --git a/crates/bashkit/src/builtins/generated/num_parser.rs b/crates/bashkit/src/builtins/generated/num_parser.rs
index b0030e559..6f1e1cc53 100644
--- a/crates/bashkit/src/builtins/generated/num_parser.rs
+++ b/crates/bashkit/src/builtins/generated/num_parser.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uucore/src/lib/features/parser/num_parser.rs
+// Source: uutils/coreutils@8613dffab src/uucore/src/lib/features/parser/num_parser.rs
 // Regenerate: cargo run -p bashkit-coreutils-port -- port-module <UUTILS_DIR> format <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
diff --git a/crates/bashkit/src/builtins/generated/od_args.rs b/crates/bashkit/src/builtins/generated/od_args.rs
index 944ea5a54..d25e4d9c4 100644
--- a/crates/bashkit/src/builtins/generated/od_args.rs
+++ b/crates/bashkit/src/builtins/generated/od_args.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uu/od/
+// Source: uutils/coreutils@8613dffab src/uu/od/
 // Regenerate: cargo run -p bashkit-coreutils-port -- <UUTILS_DIR> od <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
@@ -87,7 +87,7 @@ pub fn od_command() -> Command {
                 .long(options::SKIP_BYTES)
                 .help(
                     ::std::string::String::from(
-                        "Skip bytes input bytes before formatting and writing.",
+                        "Skip BYTES input bytes before formatting and writing.",
                     ),
                 )
                 .value_name("BYTES")
@@ -166,6 +166,7 @@ pub fn od_command() -> Command {
         .arg(
             Arg::new("o")
                 .short('o')
+                .short_alias('B')
                 .help(::std::string::String::from("octal 2-byte units"))
                 .action(ArgAction::SetTrue),
         )
diff --git a/crates/bashkit/src/builtins/generated/readlink_args.rs b/crates/bashkit/src/builtins/generated/readlink_args.rs
index 56fcb54e6..c8ba2d94a 100644
--- a/crates/bashkit/src/builtins/generated/readlink_args.rs
+++ b/crates/bashkit/src/builtins/generated/readlink_args.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uu/readlink/
+// Source: uutils/coreutils@8613dffab src/uu/readlink/
 // Regenerate: cargo run -p bashkit-coreutils-port -- <UUTILS_DIR> readlink <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
diff --git a/crates/bashkit/src/builtins/generated/realpath_args.rs b/crates/bashkit/src/builtins/generated/realpath_args.rs
index 163572fec..805fed84e 100644
--- a/crates/bashkit/src/builtins/generated/realpath_args.rs
+++ b/crates/bashkit/src/builtins/generated/realpath_args.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uu/realpath/
+// Source: uutils/coreutils@8613dffab src/uu/realpath/
 // Regenerate: cargo run -p bashkit-coreutils-port -- <UUTILS_DIR> realpath <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
diff --git a/crates/bashkit/src/builtins/generated/shuf_args.rs b/crates/bashkit/src/builtins/generated/shuf_args.rs
index 722745a57..b09830fb2 100644
--- a/crates/bashkit/src/builtins/generated/shuf_args.rs
+++ b/crates/bashkit/src/builtins/generated/shuf_args.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uu/shuf/
+// Source: uutils/coreutils@8613dffab src/uu/shuf/
 // Regenerate: cargo run -p bashkit-coreutils-port -- <UUTILS_DIR> shuf <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
diff --git a/crates/bashkit/src/builtins/generated/stat_args.rs b/crates/bashkit/src/builtins/generated/stat_args.rs
index b910fdc65..d3852fd13 100644
--- a/crates/bashkit/src/builtins/generated/stat_args.rs
+++ b/crates/bashkit/src/builtins/generated/stat_args.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uu/stat/
+// Source: uutils/coreutils@8613dffab src/uu/stat/
 // Regenerate: cargo run -p bashkit-coreutils-port -- <UUTILS_DIR> stat <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
diff --git a/crates/bashkit/src/builtins/generated/tac_args.rs b/crates/bashkit/src/builtins/generated/tac_args.rs
index ee3c205aa..2c92668b8 100644
--- a/crates/bashkit/src/builtins/generated/tac_args.rs
+++ b/crates/bashkit/src/builtins/generated/tac_args.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uu/tac/
+// Source: uutils/coreutils@8613dffab src/uu/tac/
 // Regenerate: cargo run -p bashkit-coreutils-port -- <UUTILS_DIR> tac <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
diff --git a/crates/bashkit/src/builtins/generated/tee_args.rs b/crates/bashkit/src/builtins/generated/tee_args.rs
index df7a7c13e..290b30d04 100644
--- a/crates/bashkit/src/builtins/generated/tee_args.rs
+++ b/crates/bashkit/src/builtins/generated/tee_args.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uu/tee/
+// Source: uutils/coreutils@8613dffab src/uu/tee/
 // Regenerate: cargo run -p bashkit-coreutils-port -- <UUTILS_DIR> tee <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
diff --git a/crates/bashkit/src/builtins/generated/truncate_args.rs b/crates/bashkit/src/builtins/generated/truncate_args.rs
index b6c68aa13..6730ae0a2 100644
--- a/crates/bashkit/src/builtins/generated/truncate_args.rs
+++ b/crates/bashkit/src/builtins/generated/truncate_args.rs
@@ -1,6 +1,6 @@
 // GENERATED by bashkit-coreutils-port. DO NOT EDIT.
 //
-// Source: uutils/coreutils@6579cc2 src/uu/truncate/
+// Source: uutils/coreutils@8613dffab src/uu/truncate/
 // Regenerate: cargo run -p bashkit-coreutils-port -- <UUTILS_DIR> truncate <REV>
 //
 // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.