diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 96bc4e14073..9b20d86c179 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,32 +1,20 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=2.7.1
-revision=2
-build_style=gnu-configure
-configure_args="ac_cv_file__proc_self_stat=yes"
-hostmakedepends="automake libtool"
-makedepends="ncurses-devel"
-depends="bc groff"
-register_shell="/usr/bin/fish"
-conf_files="/etc/fish/config.fish"
+version=3.0.0
+revision=1
 wrksrc="fish-${version}"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="http://fishshell.com/"
-license="GPL-2"
+build_style=cmake
+makedepends="ncurses-devel pcre2-devel gettext-devel"
+depends="bc groff"
 short_desc="User friendly shell intended mostly for interactive use"
+maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://fishshell.com/"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.gz"
-checksum=e42bb19c7586356905a58578190be792df960fa81de35effb1ca5a5a981f0c5a
+checksum=ea9dd3614bb0346829ce7319437c6a93e3e1dfde3b7f6a469b543b0d2c68f2cf
+register_shell="/usr/bin/fish"
 
-if [ -n "$CROSS_BUILD" ]; then
-	case "$XBPS_TARGET_MACHINE" in
-	*-musl)	# Nothing to add
-		;;
-	*)	# Add CXXFLAGS required for glibc
-		CXXFLAGS="-D_GNU_SOURCE=1 -D_ISO99_SOURCE=1"
-		;;
-	esac
-fi
-
-pre_configure() {
-	autoreconf -fi
+post_install() {
+	# Starting with fish-3.0.0 this is a skeleton file with only comments
+	rm -f "${DESTDIR}/usr/etc/fish/config.fish"
 }