diff --git a/srcpkgs/fish-shell/patches/fish-safe-strerror.patch b/srcpkgs/fish-shell/patches/fish-safe-strerror.patch
deleted file mode 100644
index 5d32b2c104d..00000000000
--- a/srcpkgs/fish-shell/patches/fish-safe-strerror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/wutil.cpp b/wutil.cpp
---- wutil.cpp.orig	2013-10-19 22:10:26.000000000 +0200
-+++ wutil.cpp	2014-02-05 17:30:54.372370762 +0100
-@@ -319,7 +319,7 @@ static inline void safe_append(char *buf
- 
- const char *safe_strerror(int err)
- {
--#if defined(__UCLIBC__)
-+#if defined(__UCLIBC__) || !defined(__GLIBC__)
-     // uClibc does not have sys_errlist, however, its strerror is believed to be async-safe
-     // See #808
-     return strerror(err);
diff --git a/srcpkgs/fish-shell/patches/include-select-header.patch b/srcpkgs/fish-shell/patches/include-select-header.patch
deleted file mode 100644
index 80f4aa74b08..00000000000
--- a/srcpkgs/fish-shell/patches/include-select-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- iothread.cpp.orig
-+++ iothread.cpp
-@@ -11,6 +11,7 @@
- #include <signal.h>
- #include <fcntl.h>
- #include <queue>
-+#include <sys/select.h>
- 
- #ifdef _POSIX_THREAD_THREADS_MAX
- #if _POSIX_THREAD_THREADS_MAX < 64
diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index f1afbb8252f..292d7c9afff 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,9 +1,9 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=2.2.0
-revision=3
+version=2.3.0
+revision=1
 build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
 makedepends="ncurses-devel"
 register_shell="/usr/bin/fish"
 conf_files="/etc/fish/config.fish"
@@ -13,7 +13,7 @@ homepage="http://fishshell.com/"
 license="GPL-2"
 short_desc="User friendly shell intended mostly for interactive use"
 distfiles="http://fishshell.com/files/${version}/fish-${version}.tar.gz"
-checksum=a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a
+checksum=912bac47552b1aa0d483a39ade330356632586a8f726c0e805b46d45cfad54e5
 
 if [ -n "$CROSS_BUILD" ]; then
 	case "$XBPS_TARGET_MACHINE" in