diff --git a/app-shells/fish/fish-2.4.0.recipe b/app-shells/fish/fish-2.4.0.recipe
index de043b0c4..efe4dbfea 100644
--- a/app-shells/fish/fish-2.4.0.recipe
+++ b/app-shells/fish/fish-2.4.0.recipe
@@ -5,7 +5,7 @@ is simple but incompatible with other shell languages."
 HOMEPAGE="http://ridiculousfish.com/shell/"
 COPYRIGHT="2005-2016 Axel Liljencrantz"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/fish-shell/fish-shell/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="5b7680232cadcadeba42e38aac33bfd4d12333e70342d3d3485ad5d329b1f465"
 SOURCE_DIR="fish-shell-$portVersion"
@@ -59,8 +59,14 @@ GLOBAL_WRITABLE_FILES="
 BUILD()
 {
 	autoreconf -vfi
-	CFLAGS=-D_BSD_SOURCE LDFLAGS="-lnetwork" runConfigure ./configure \
+
+	export CFLAGS="-D_BSD_SOURCE"
+	export CXXFLAGS=$CFLAGS
+	export LIBS="-lnetwork -lexecinfo"
+
+	runConfigure ./configure \
 		--without-included-pcre2
+
 	make $jobArgs
 }