diff --git a/packages/fish/build.sh b/packages/fish/build.sh
index 6050675d5..77bbcb87b 100644
--- a/packages/fish/build.sh
+++ b/packages/fish/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://fishshell.com/
 TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
 TERMUX_PKG_VERSION=2.4.0
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 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.
diff --git a/packages/fish/src-fish.cpp.patch b/packages/fish/src-fish.cpp.patch
new file mode 100644
index 000000000..e2b357ba5
--- /dev/null
+++ b/packages/fish/src-fish.cpp.patch
@@ -0,0 +1,12 @@
+diff -u -r ../fish-2.4.0/src/fish.cpp ./src/fish.cpp
+--- ../fish-2.4.0/src/fish.cpp	2016-11-07 22:20:54.000000000 -0500
++++ ./src/fish.cpp	2016-12-29 02:39:05.173696719 -0500
+@@ -421,6 +421,8 @@
+ }
+ 
+ int main(int argc, char **argv) {
++    // Termux patch: Setup TMPDIR for use by fish functions such as funced and psub.
++    if (getenv("TMPDIR") == NULL) putenv("TMPDIR=@TERMUX_PREFIX@/tmp");
+     int res = 1;
+     int my_optind = 0;
+