diff --git a/srcpkgs/fish-shell/patches/fish-safe-strerror.patch b/srcpkgs/fish-shell/patches/fish-safe-strerror.patch
new file mode 100644
index 00000000000..5d32b2c104d
--- /dev/null
+++ b/srcpkgs/fish-shell/patches/fish-safe-strerror.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 00000000000..80f4aa74b08
--- /dev/null
+++ b/srcpkgs/fish-shell/patches/include-select-header.patch
@@ -0,0 +1,10 @@
+--- 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