diff --git a/app-shells/fish/fish-2.2.0.recipe b/app-shells/fish/fish-2.2.0.recipe
index 51ed65ec0..f76a1f555 100644
--- a/app-shells/fish/fish-2.2.0.recipe
+++ b/app-shells/fish/fish-2.2.0.recipe
@@ -5,12 +5,11 @@ focused on user friendliness and discoverability. The language syntax \
 is simple but incompatible with other shell languages.
 "
 HOMEPAGE="http://ridiculousfish.com/shell/"
-COPYRIGHT="2005-20009 Axel Liljencrantz"
-LICENSE="GNU GPL v2"
-REVISION="1"
 SOURCE_URI="https://github.com/fish-shell/fish-shell/releases/download/2.2.0/fish-2.2.0.tar.gz"
 CHECKSUM_SHA256="a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a"
-PATCHES="fish-2.2.0.patch"
+REVISION="1"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-20015 Axel Liljencrantz"
 
 ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -31,7 +30,6 @@ REQUIRES="
 	lib:libgettextlib_0.18.1$secondaryArchSuffix >= 0.18.1.1
 	lib:libintl$secondaryArchSuffix
 	"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
@@ -39,7 +37,9 @@ BUILD_REQUIRES="
 	devel:libgettextlib$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
 	cmd:autoconf
+	cmd:automake
 	cmd:libtoolize
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
@@ -48,18 +48,16 @@ BUILD_PREREQUIRES="
 	#cmd:doxygen >= 1.6.3
 	"
 
+PATCHES="fish-2.2.0.patch"
+
 GLOBAL_WRITABLE_FILES="
 	settings/fish/config.fish keep-old
 "
 
 BUILD()
 {
-	libtoolize --force --copy --install
-	autoconf
+	autoreconf -vfi
 	runConfigure ./configure
-	#FIXME! The hack in configure.ac doesn’t work.
-	sed -i -e '/-rdynamic/d' Makefile
-	#FIXME! The hack in configure.ac doesn’t work.
 	make
 }
 
@@ -71,4 +69,4 @@ INSTALL()
 TEST()
 {
 	make test
-}
\ No newline at end of file
+}
diff --git a/app-shells/fish/patches/fish-2.2.0.patch b/app-shells/fish/patches/fish-2.2.0.patch
index d1379b6bc..5966a105c 100644
--- a/app-shells/fish/patches/fish-2.2.0.patch
+++ b/app-shells/fish/patches/fish-2.2.0.patch
@@ -1,22 +1,47 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2015-07-03 19:46:59.002359296 +0000
-+++ b/configure.ac	2015-08-29 17:09:39.068157440 +0000
-@@ -211,7 +211,13 @@
+diff --git a/configure.ac b/configure.ac
+index 49ff391..7404001 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,6 +100,19 @@ echo "CXXFLAGS: $CXXFLAGS"
+ #
+ AC_CONFIG_HEADERS(config.h)
+ 
++dnl ----------------------------------------------
++dnl CHECK FOR MACHINE/VENDOR/OPERATING SYSTEM TYPE
++dnl ----------------------------------------------
++dnl Find out machine type, vendor, and operating system
++dnl What type of host is this?
++AC_CANONICAL_HOST
++AC_DEFINE_UNQUOTED(MACHTYPE, "$host_cpu",
++[Define to be the machine type (microprocessor class or machine model).])
++AC_DEFINE_UNQUOTED(VENDOR,   "$host_vendor",
++[Define to be a string corresponding the vendor of the machine.])
++AC_DEFINE_UNQUOTED(OSTYPE,   "$host_os",
++[Define to be the name of the operating system.])
++
+ 
+ #
+ # This adds markup to the code that results in a few extra compile
+@@ -210,9 +223,15 @@ CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare"
+ # This is needed in order to get the really cool backtraces on Linux
  #
  
- if test `uname` != "Darwin"; then
+-if test `uname` != "Darwin"; then
 -   LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic"
-+	case $target_os in
-+		haiku*)
-+			;;
-+		*)
-+			LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic"
-+			;;
-+	esac
- fi
+-fi
++case "$host_os" in
++	darwin* )
++		;;
++	haiku*)
++		;;
++	*)
++		LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic"
++		;;
++esac
  
  #
-@@ -349,7 +355,7 @@
+ # On Cygwin, we need to add some flags for ncurses.
+@@ -349,7 +368,7 @@ AC_DEFINE([NOMACROS], [1], [Define to 1 to disable curses macros that conflict w
  #
  
  # Check for os dependant libraries for all binaries.
@@ -25,10 +50,10 @@ diff -ur a/configure.ac b/configure.ac
  AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
  AC_SEARCH_LIBS( shm_open, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
  AC_SEARCH_LIBS( pthread_create, pthread, , [AC_MSG_ERROR([Cannot find the pthread library, needed to build this package.] )] )
-
-diff -ur a/env_universal_common.cpp b/env_universal_common.cpp
---- a/env_universal_common.cpp	2015-07-03 19:46:59.011534336 +0000
-+++ b/env_universal_common.cpp	2015-08-29 16:48:54.951844864 +0000
+diff --git a/env_universal_common.cpp b/env_universal_common.cpp
+index b493de2..0b9c8c9 100644
+--- a/env_universal_common.cpp
++++ b/env_universal_common.cpp
 @@ -36,6 +36,10 @@
  #include <notify.h>
  #endif
@@ -40,7 +65,7 @@ diff -ur a/env_universal_common.cpp b/env_universal_common.cpp
  // NAME_MAX is not defined on Solaris and suggests the use of pathconf()
  // There is no obvious sensible pathconf() for shared memory and _XPG_NAME_MAX
  // seems a reasonable choice.
-@@ -982,7 +986,7 @@
+@@ -982,7 +986,7 @@ void env_universal_t::parse_message_internal(const wcstring &msgstr, var_table_t
  /* Thanks to Jan Brittenson
   http://lists.apple.com/archives/xcode-users/2009/May/msg00062.html
   */
@@ -49,7 +74,7 @@ diff -ur a/env_universal_common.cpp b/env_universal_common.cpp
  
  /* Linux */
  #include <net/if.h>
-@@ -1005,7 +1009,7 @@
+@@ -1005,7 +1009,7 @@ static bool get_mac_address(unsigned char macaddr[MAC_ADDRESS_MAX_LEN], const ch
      return result;
  }
  
@@ -58,7 +83,7 @@ diff -ur a/env_universal_common.cpp b/env_universal_common.cpp
  
  /* OS X and BSD */
  #include <ifaddrs.h>
-@@ -1102,6 +1106,10 @@
+@@ -1102,6 +1106,10 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t
  #define SHMEM_MAGIC_NUMBER 0xF154
  #define SHMEM_VERSION_CURRENT 1000
  
@@ -69,10 +94,10 @@ diff -ur a/env_universal_common.cpp b/env_universal_common.cpp
      private:
      long long last_change_time;
      uint32_t last_seed;
-
-diff -ur a/intern.cpp b/intern.cpp
---- a/intern.cpp	2015-07-03 19:46:59.016777216 +0000
-+++ b/intern.cpp	2015-08-29 16:54:24.978321408 +0000
+diff --git a/intern.cpp b/intern.cpp
+index 56dec21..cc8a299 100644
+--- a/intern.cpp
++++ b/intern.cpp
 @@ -20,6 +20,10 @@
  #include "common.h"
  #include "intern.h"
@@ -84,10 +109,10 @@ diff -ur a/intern.cpp b/intern.cpp
  /** Comparison function for intern'd strings */
  class string_table_compare_t
  {
-
-diff -ur a/iothread.cpp b/iothread.cpp
---- a/iothread.cpp	2015-07-03 19:46:59.017039360 +0000
-+++ b/iothread.cpp	2015-08-29 16:58:04.486801408 +0000
+diff --git a/iothread.cpp b/iothread.cpp
+index 1fcd137..f621f8c 100644
+--- a/iothread.cpp
++++ b/iothread.cpp
 @@ -12,6 +12,12 @@
  #include <fcntl.h>
  #include <queue>
@@ -100,4 +125,4 @@ diff -ur a/iothread.cpp b/iothread.cpp
 +
  #ifdef _POSIX_THREAD_THREADS_MAX
  #if _POSIX_THREAD_THREADS_MAX < 64
- #define IO_MAX_THREADS _POSIX_THREAD_THREADS_MAX
\ No newline at end of file
+ #define IO_MAX_THREADS _POSIX_THREAD_THREADS_MAX