diff --git a/srcpkgs/gsoap/patches/fix-musl-again.patch b/srcpkgs/gsoap/patches/fix-musl-again.patch
new file mode 100644
index 00000000000..38d97a5a4c6
--- /dev/null
+++ b/srcpkgs/gsoap/patches/fix-musl-again.patch
@@ -0,0 +1,22 @@
+--- gsoap/stdsoap2.c.orig	2017-05-22 20:36:36.124570820 -0400
++++ gsoap/stdsoap2.c	2017-05-22 20:36:52.229856096 -0400
+@@ -4395,7 +4395,7 @@
+       return soap->error = SOAP_EOM;
+     return SOAP_OK;
+   }
+-#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__)
++#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) || defined(LINUX)
+   if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0)
+     host = NULL;
+ #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
+--- gsoap/stdsoap2.cpp	2017-05-22 20:43:17.974688879 -0400
++++ gsoap/stdsoap2.cpp.orig	2017-04-07 14:39:02.000000000 -0400
+@@ -4395,7 +4395,7 @@
+       return soap->error = SOAP_EOM;
+     return SOAP_OK;
+   }
+-#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__)
++#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) || defined(LINUX)
+   if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0)
+     host = NULL;
+ #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
diff --git a/srcpkgs/gsoap/patches/musl-fixes.patch b/srcpkgs/gsoap/patches/fix-musl.patch
similarity index 77%
rename from srcpkgs/gsoap/patches/musl-fixes.patch
rename to srcpkgs/gsoap/patches/fix-musl.patch
index 9ac981727e8..8a955ac13c8 100644
--- a/srcpkgs/gsoap/patches/musl-fixes.patch
+++ b/srcpkgs/gsoap/patches/fix-musl.patch
@@ -1,3 +1,11 @@
+With thanks to alpine.
+https://git.alpinelinux.org/cgit/aports/tree/community/gsoap/musl-fixes.patch
+
+The first patch I think should not be necessary, but is because the same source
+file defines _GNU_SOURCE if gnu-linux and !defined(_GNU_SOURCE) (go read the
+code, it's the first two places _GNU_SOURCE is used in gsoap/stdsoap2.cpp).
+I don't know why, but it seems wrong to me.
+
 --- ./gsoap/stdsoap2.cpp.orig
 +++ ./gsoap/stdsoap2.cpp
 @@ -18691,7 +18691,7 @@