diff --git a/coreutils-fix-metadata.diff b/coreutils-fix-metadata.diff
index 90edc62..cb62082 100644
--- a/coreutils-fix-metadata.diff
+++ b/coreutils-fix-metadata.diff
@@ -1,5 +1,5 @@
 --- coreutils-0.0.27/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ coreutils-0.0.27/Cargo.toml	2026-01-05T09:34:07.355658+00:00
++++ coreutils-0.0.27/Cargo.toml	2024-12-05T01:07:05.985631+00:00
 @@ -30,6 +30,7 @@
  categories = ["command-line-utilities"]
  license = "MIT"
@@ -20,21 +20,12 @@
  
  [dependencies.arch]
  version = "0.0.27"
-@@ -620,7 +616,7 @@
- version = "0.3.1"
- 
- [dev-dependencies.hex-literal]
--version = "0.4.1"
-+version = ">=0.4.1, <2.0"
- 
- [dev-dependencies.libc]
- version = "0.2.153"
 @@ -639,7 +635,7 @@
  version = "1.10.4"
  
  [dev-dependencies.rstest]
 -version = "0.21.0"
-+version = "0.26.0"
++version = ">=0.21,<0.24"
  
  [dev-dependencies.sha1]
  version = "0.10.6"
@@ -56,7 +47,7 @@
  
  [target."cfg(any(target_os = \"linux\", target_os = \"android\"))".dev-dependencies.procfs]
 -version = "0.16"
-+version = ">=0.16, <0.19"
++version = ">=0.16, <0.18"
  default-features = false
  
  [target."cfg(unix)".dev-dependencies.nix]
diff --git a/coreutils-wrapper.sh b/coreutils-wrapper.sh
new file mode 100755
index 0000000..88ee673
--- /dev/null
+++ b/coreutils-wrapper.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Wrapper to invoke coreutils multicall via individual libexec symlink
+#
+# To use:
+# - symlink this to /usr/bin/uu_$utility
+# - it will invoke /usr/libexec/uutils-coreutils/$utility
+# - that is in turn a symlink to /usr/bin/uutils-coreutils, which is a
+#   multicall binary that behaves like $utility when that is argv[0]
+
+CALLED_AS=$(basename "$0")
+
+UTILITY=${CALLED_AS#uu_}
+
+CMD="/usr/libexec/uutils-coreutils/$UTILITY"
+
+if [ -L "$CMD" ]; then
+  # we want the argv to be passed as-is here
+  # shellcheck disable=SC2068
+  "$CMD" $@
+else
+  echo "Error: $CMD not found" >&2
+  exit 1
+fi
diff --git a/rust-coreutils.spec b/rust-coreutils.spec
index 310bc69..c77e81d 100644
--- a/rust-coreutils.spec
+++ b/rust-coreutils.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 28
+# Generated by rust2rpm 27
 %bcond check 1
 
 %global crate coreutils
@@ -11,17 +11,16 @@ Summary:        coreutils ~ GNU coreutils reimplementation in Rust
 License:        MIT
 URL:            https://crates.io/crates/coreutils
 Source:         %{crates_source}
+# * Wrapper to invoke coreutils multicall via individual libexec symlink
+Source1:        coreutils-wrapper.sh
 # * Script to list available coreutils commands
-Source1:        coreutils-ls-commands.sh
+Source2:        coreutils-ls-commands.sh
 # Manually created patch for downstream crate metadata changes
 # * drop uudoc, unneeded
-# * update rstest to 0.26:
-#   https://github.com/uutils/coreutils/commit/001a91fbe6adea29a566326df3fcda30f89e97ab
+# * allow up to rstest 0.23
 # * enable feat_acl
 # * TODO: enable unix
-# * allow procfs 0.17, 0.18
-# * allow hex-literal 1.0:
-#   https://github.com/uutils/coreutils/commit/944cd4f72ca7d6e87d06d0a0a5b9e8dafedfba4b
+# * allow procfs 0.17
 Patch:          coreutils-fix-metadata.diff
 # * Fix seq tests that pass negative numbers
 Patch2:         coreutils-fix-seq-neg-num-tests.diff
@@ -153,6 +152,8 @@ Obsoletes:      uu_yes < %{obsolete_uu_nvr}
 %doc README.md
 %{_bindir}/uutils-coreutils
 %{_bindir}/uu_*
+%dir %{_libexecdir}/uutils-coreutils
+%{_libexecdir}/uutils-coreutils/*
 %{_mandir}/man1/*
 %{bash_completions_dir}/*
 %{fish_completions_dir}/*
@@ -161,8 +162,10 @@ Obsoletes:      uu_yes < %{obsolete_uu_nvr}
 %prep
 %autosetup -n %{crate}-%{version} -p1
 %cargo_prep
-# coreutils-ls-commands.sh script
+# coreutils-wrapper.sh script
 cp -p %{SOURCE1} .
+# coreutils-ls-commands.sh script
+cp -p %{SOURCE2} .
 
 %generate_buildrequires
 %cargo_generate_buildrequires
@@ -191,8 +194,11 @@ target/rpm/coreutils completion coreutils fish > data/completions/fish/uutils-co
 %install
 %cargo_install
 mv %{buildroot}/%{_bindir}/coreutils %{buildroot}/%{_bindir}/uutils-coreutils
+mkdir -p %{buildroot}%{_libexecdir}/uutils-coreutils/misc
+cp -p coreutils-wrapper.sh %{buildroot}%{_libexecdir}/uutils-coreutils/misc/
 for utility in $(./coreutils-ls-commands.sh target/rpm/coreutils); do
-  ln -sr %{buildroot}%{_bindir}/uutils-coreutils  %{buildroot}%{_bindir}/uu_$utility
+  ln -sr %{buildroot}%{_bindir}/uutils-coreutils %{buildroot}%{_libexecdir}/uutils-coreutils/$utility
+  ln -sr %{buildroot}%{_libexecdir}/uutils-coreutils/misc/coreutils-wrapper.sh %{buildroot}%{_bindir}/uu_$utility
 done
 mkdir -p %{buildroot}%{_mandir}/man1
 cp -p data/man/man1/* %{buildroot}%{_mandir}/man1/
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 0548894..45650af 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -4,14 +4,14 @@ description = "coreutils ~ GNU coreutils (updated); implemented as universal (cr
 
 cargo-toml-patch-comments = [
   "drop uudoc, unneeded",
-  "update rstest to 0.26: https://github.com/uutils/coreutils/commit/001a91fbe6adea29a566326df3fcda30f89e97ab",
+  "allow up to rstest 0.23",
   "enable feat_acl",
   "TODO: enable unix",
-  "allow procfs 0.17, 0.18",
-  "allow hex-literal 1.0: https://github.com/uutils/coreutils/commit/944cd4f72ca7d6e87d06d0a0a5b9e8dafedfba4b",
+  "allow procfs 0.17",
 ]
 extra-sources = [
-  { "number" = 1, "file" = "coreutils-ls-commands.sh", "comments" = ["Script to list available coreutils commands"] },
+  { "number" = 1, "file" = "coreutils-wrapper.sh", "comments" = ["Wrapper to invoke coreutils multicall via individual libexec symlink"] },
+  { "number" = 2, "file" = "coreutils-ls-commands.sh", "comments" = ["Script to list available coreutils commands"] },
 ]
 extra-patches = [
   { "number" = 2, "file" = "coreutils-fix-seq-neg-num-tests.diff", "comments" = ["Fix seq tests that pass negative numbers"] },
@@ -21,6 +21,8 @@ bin-package-name = "uutils-coreutils"
 
 extra-files = [
   "%{_bindir}/uu_*",
+  "%dir %{_libexecdir}/uutils-coreutils",
+  "%{_libexecdir}/uutils-coreutils/*",
   "%{_mandir}/man1/*",
   "%{bash_completions_dir}/*",
   "%{fish_completions_dir}/*",
@@ -32,8 +34,10 @@ coreutils = "uutils-coreutils"
 
 [scripts]
 prep.post = ["""\
+# coreutils-wrapper.sh script
+cp -p %{SOURCE1} .
 # coreutils-ls-commands.sh script
-cp -p %{SOURCE1} ."""]
+cp -p %{SOURCE2} ."""]
 
 build.post = ["""\
 mkdir -p data/man/man1
@@ -54,8 +58,11 @@ target/rpm/coreutils completion coreutils fish > data/completions/fish/uutils-co
 """]
 
 install.post = ["""\
+mkdir -p %{buildroot}%{_libexecdir}/uutils-coreutils/misc
+cp -p coreutils-wrapper.sh %{buildroot}%{_libexecdir}/uutils-coreutils/misc/
 for utility in $(./coreutils-ls-commands.sh target/rpm/coreutils); do
-  ln -sr %{buildroot}%{_bindir}/uutils-coreutils  %{buildroot}%{_bindir}/uu_$utility
+  ln -sr %{buildroot}%{_bindir}/uutils-coreutils %{buildroot}%{_libexecdir}/uutils-coreutils/$utility
+  ln -sr %{buildroot}%{_libexecdir}/uutils-coreutils/misc/coreutils-wrapper.sh %{buildroot}%{_bindir}/uu_$utility
 done
 mkdir -p %{buildroot}%{_mandir}/man1
 cp -p data/man/man1/* %{buildroot}%{_mandir}/man1/