diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 72ec7a8a301..17df46fd1c3 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,11 +1,12 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=2.3.1
-revision=2
+version=2.4.0
+revision=1
 build_style=gnu-configure
+configure_args="ac_cv_file__proc_self_stat=yes"
 hostmakedepends="automake libtool"
 makedepends="ncurses-devel"
-depends="bc"
+depends="bc groff"
 register_shell="/usr/bin/fish"
 conf_files="/etc/fish/config.fish"
 wrksrc="fish-${version}"
@@ -14,7 +15,7 @@ homepage="http://fishshell.com/"
 license="GPL-2"
 short_desc="User friendly shell intended mostly for interactive use"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.gz"
-checksum=328acad35d131c94118c1e187ff3689300ba757c4469c8cc1eaa994789b98664
+checksum=06bbb2323360439c4044da762d114ec1aa1aba265cec71c0543e6a0095c9efc5
 
 if [ -n "$CROSS_BUILD" ]; then
 	case "$XBPS_TARGET_MACHINE" in
@@ -24,11 +25,8 @@ if [ -n "$CROSS_BUILD" ]; then
 		CXXFLAGS="-D_GNU_SOURCE=1 -D_ISO99_SOURCE=1"
 		;;
 	esac
-	export ac_cv_file__proc_self_stat=yes
 fi
+
 pre_configure() {
-	if [ -n "$CROSS_BUILD" ]; then
-		patch -p0 < ${FILESDIR}/no-glibc-check.patch
-	fi
 	autoreconf -fi
 }