diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 41c526ad417..29ad3da53db 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,18 +1,21 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=3.7.1
+version=4.0.0
 revision=1
 build_style=cmake
-hostmakedepends="gettext"
-makedepends="ncurses-devel pcre2-devel"
-checkdepends="python3-pexpect procps-ng"
+build_helper="rust"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DRust_CARGO=${XBPS_WRAPPERDIR}/cargo"
+make_check_target="fish_run_tests"
+hostmakedepends="gettext pkg-config cargo cargo-auditable"
+makedepends="pcre2-devel rust-std"
+checkdepends="git mdocml python3-pexpect procps-ng"
 short_desc="User friendly shell intended mostly for interactive use"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
 license="GPL-2.0-only"
 homepage="https://fishshell.com/"
-changelog="https://github.com/fish-shell/fish-shell/raw/master/CHANGELOG.rst"
+changelog="https://raw.githubusercontent.com/fish-shell/fish-shell/refs/heads/master/CHANGELOG.rst"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=614c9f5643cd0799df391395fa6bbc3649427bb839722ce3b114d3bbc1a3b250
+checksum=2fda5bd970357064d8d4c896e08285ba59965ca2a8c4829ca8a82bf3b89c69f3
 register_shell="/bin/fish /usr/bin/fish"
 # tests don't work as root
 make_check=ci-skip