diff --git a/main/libtirpc/APKBUILD b/main/libtirpc/APKBUILD
index f22a8d6b492a6afe7a50418bced8f620a1888b49..8fecefa8fa6bb22ed1f30b01135726f6fd5248c5 100644
--- a/main/libtirpc/APKBUILD
+++ b/main/libtirpc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libtirpc
 pkgver=0.2.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Transport Independent RPC library (SunRPC replacement)"
 url="http://libtirpc.sourceforge.net/"
 arch="all"
@@ -19,10 +19,13 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	# uclibc does not provide nis.h so provide our own
+	# uclibc/musl does not provide nis.h so provide our own
 	mkdir src/rpcsvc
 	cp "$srcdir"/nis.h src/rpcsvc/
 
+	# -DGQ makes tirpc implement getrpcbynumber
+	[ "$CLIBC" == musl ] && export CFLAGS="$CFLAGS -DGQ"
+
 	for i in $source; do
 		case $i in
 		*.patch)
@@ -56,12 +59,12 @@ package() {
 md5sums="847995e8d002cbf1387bda05947be086  libtirpc-0.2.4.tar.bz2
 082dff1bc78bdcbac6d305c1534fe3c0  nis.h
 80e8f54aab0f5bed37e58ad79fe4ff2b  libtirpc-no-des.patch
-26e391e40f06d3d14189ec6ae0598948  musl-compliance.patch"
+03346638e924d4c811a55d0cbeee7320  musl-compliance.patch"
 sha256sums="45c3e21dfc23a5ba501f9dfc6671678316fdfdb8355a1ec404ae2aa2f81943a1  libtirpc-0.2.4.tar.bz2
 7149d53da167168cbad9e75cbab302768f659e59e208763b1bf5df2a6ff3bfdb  nis.h
 5b7c8f6d19f17541902dfd1b1132f2b07e4cc0987152d4e8007243e776d4d47f  libtirpc-no-des.patch
-8c54cf46095945c25c8bf4968e67e6304bbae82352d3c25a6532af66443e931a  musl-compliance.patch"
+9f7b24fe9297af917826c1d3fba4909d76f2ddb0a66db417ae8026a39715cc49  musl-compliance.patch"
 sha512sums="8b7fec13d34ad0ddfa3832f4a4955607d94f6a691fedcc81a98554345f6c6e64d5f289490a10a80600cebf5b53cfad99c0d78007b88f8f2fbc60cbb8680fc87f  libtirpc-0.2.4.tar.bz2
 15edac1e30cc1aa65ca495bae14c6c7455d65ca539b7e5c865c3fbd5a51c76966b37dd34e9a6483aadcaea3602aefb0b48cdb46f877dae1c65dfa6840dfd8c54  nis.h
 9a984a7741deb943f92cd8a9f23d1a0e09a01e91aa88268456ccbb7998b24f50ad431e26400def3a8ba9d6cd345e5abccf5acf9c59708ce8f0653275c2ea5d61  libtirpc-no-des.patch
-5c0414345e863057eb0ff28f97e654e22fc444f4d72c392de83ab372d0485123c8a42bc558c3688c5b24f3cc83997db5324b2cc57a2676b658761dce45605999  musl-compliance.patch"
+5df2a92838a6c15ff26dc0a75b0599c42f95b6fbda7dd407b975118e79519e6bdbc77307aa6c4bda33c5a2e4cacabf996900220f140b1e121ece198c33d21b13  musl-compliance.patch"
diff --git a/main/libtirpc/musl-compliance.patch b/main/libtirpc/musl-compliance.patch
index f325a02b26b79b4b64f55ef0f0170a6429f7d07a..a6d69accfd21b7308df1df823420a56a7a092f22 100644
--- a/main/libtirpc/musl-compliance.patch
+++ b/main/libtirpc/musl-compliance.patch
@@ -29,3 +29,13 @@
  
  typedef int32_t bool_t;
  typedef int32_t enum_t;
+--- libtirpc-0.2.4.orig/tirpc/netconfig.h
++++ libtirpc-0.2.4/tirpc/netconfig.h
+@@ -2,6 +2,7 @@
+ #define _NETCONFIG_H_
+ 
+ #include <features.h>
++#include <sys/cdefs.h>
+ 
+ #define NETCONFIG "/etc/netconfig"
+ #define NETPATH	  "NETPATH"