-_COMMIT=c76d86631717929b3a2f259615e8603e69e13256
-TERMUX_PKG_VERSION=2.2.201605030720
-TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/archive/${_COMMIT}.zip
-# fish calls 'tput' from ncurses-utils, at least when cancelling (Ctrl+C) a command line:
-TERMUX_PKG_DEPENDS="ncurses, libgnustl, libandroid-support, ncurses-utils"
+TERMUX_PKG_VERSION=2.4.0
+TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.gz
+# fish calls 'tput' from ncurses-utils, at least when cancelling (Ctrl+C) a command line.
+# man is needed since fish calls apropos during command completion.
+TERMUX_PKG_DEPENDS="ncurses, libandroid-support, ncurses-utils, man"