diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 4fc85facd..e7a4f6004 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,4 +1,5 @@
 AUX einfo.patch 556 SHA256 3f92dc634f9d86a8d7e3ac3e3fd90e5fd7c5f22a2ade8121323d77d980b097fb SHA512 90710633ecd0486e4949991f9c6026d168014a71871af33fa30d644d94754f9fee28596117af4d12e6978e1c77ce1fd89d3edc8fe68c5d077f3061c31866f27b WHIRLPOOL c2157dec737c44425d37c3bba39790d4315f3385141d35ea15eb4a5984e8b403c10c7d1db2ac1034770ff88c90823ca5ec12685ac44adf009a340883b6e1d799
+AUX nfs-fix.patch 498 SHA256 b4a622779fc96510b93527d2c2dec2e4383411ab6715fdbb8660de943e6bf56e SHA512 84519e2d64347e5e82e1871e113cda07f8880ef2d14b9bcacb3b24aedecbf5eebf8ed3a93978e83a602f1f0d86bbe76604ba62ccc9700f6ed539512a8b76036d WHIRLPOOL 625cdd824c542e282af93c5985e96ff503ce60bde788173cb7e90a8a3f218cfbc1ea790b2e515cbb2b961d335d432dab8d40e01387acde801d844419140cc23b
 AUX openrc.logrotate 71 SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c SHA512 690612fddfb2c4cf8f6b5ba7239b9faf29eb3d9b152ab4dcf62694aa2852780440d08cee56d98a9597607f446b3697c911269562821a8402bb5747cbbae34bd9 WHIRLPOOL 8678c51583c77a4985760e4ea2082e7214f28b68cad460b362d683db71067cf6031e1f3275e83ac7959b0973cdafd0a4102525fe7b0d975798ec2182d1fd2769
 AUX start-stop-daemon.pam 63 SHA256 2681da17e4a122656b5303b7c7eca82b8fb182641290b153fdbe96b63638086d SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb WHIRLPOOL 4abc9f051155a62d3033258a06003a4ca3909d8104deca84d5c1605bc1c7e56167fd82b2b4b72fe7b707070de98a7628730de1ad3f14b924b5b1480fba5ef854
 DIST openrc-0.11.8.tar.bz2 174860 SHA256 e1f7c5ed98a63178c20f3d023a7d35fe416e8e7db2f0cf78ff346a6d2f7949a9 SHA512 aaea9f1e1d08c367beb6d35bcc1d258eb9d7b71a659c05088f9027b0558aae068b2ad7c221cf8ff8b8950f5a4a5c187ee7b986ce2d475a9e3cccda74d040f780 WHIRLPOOL 69217f13dd05e9a443d906281ada167d6892615eb5db7c372ba535a3d4a21ac3111fad9d54ef06650c3b488b848180bbfe5257dbc83f62f5ecf60724dec2900c
@@ -6,4 +7,4 @@ DIST openrc-0.12.4.tar.bz2 131914 SHA256 c4edda2fff4b613f50b9cc265bb457a9ab0170f
 DIST openrc-0.13.8.tar.bz2 151248 SHA256 317c2c59412eafd2d991369711cd520097b5526af7c78149352846643ea4416f SHA512 7e519c1e57fe273a2c9816b3f9153a498b5b38e2370c6a5ecb1251ea7a6a4bdd82f5ed3a4a5eb491f434227278d4e3fd47f71401ede866e9fdce50ea9ee510ac WHIRLPOOL 3700e993f3d17ce2e8f2cfe86278aac21edf090b5d3f1f692cfa27c5650ab8313b82b6224c37f0bda434dad4aecfeb463472aa6102d67bd4aa7076cf08057307
 EBUILD openrc-0.11.8.ebuild 16389 SHA256 bae8b70ca099671caf2f2106e54e29f995eea6d46f0d6fb4953da8e94872e722 SHA512 936cbe9061caf31922746e935a985272814389ae1a27feb1506f939e1d29eb6fbb822f10d3dc8e9fd387364c5d2b3a6093ded5755ea8ee89e191770e99a26806 WHIRLPOOL 00e2025b8c4fd625160f1cc5f2c0e39fc1fdbf881e6b3cd555595dc167de10add5fdd888364c90b0d530513e91e34e8b6ee5d02cf7f606bba071c21e9b478be6
 EBUILD openrc-0.12.4.ebuild 10542 SHA256 de1641634251371177852dac76bd534673adfa3d76bd01e15cb0e01ba997c892 SHA512 ca5d5a1751dcd4542670d44379b7d91d0b6fd52cebf1ae1c23f034391f5878e137819e979dfdb7f322db3e327b64c3265e5e208cde3be551e1e023a137589044 WHIRLPOOL bd11a28f5963681a2911f87bd9a47d1377d37b31b9b1f96cfb679fe66941ee657b7bf2d11b3f8bc363723e45e6610ff78636d510aaddb10e6a3b91e23fa01732
-EBUILD openrc-0.13.8.ebuild 10775 SHA256 7acbff154e1c450c72de9246b3344e4d1c3c409db2a0e33b474475cd4b6b2425 SHA512 b29fcb33d91d12290212584a930a2c96f2929615dd4f600951fb260f201d5bbc1107f7c5c041438931a3e245241e7f1a5f225ea24e9599827ca45acbb9d97ca8 WHIRLPOOL cb992b123369d694ba63170bb1bc2b8f57339d75a19a9d2db4f211435383c04d322b813d2a7f7af4521e5237531eb8900d8ccabea1ebdb0a521b574ede40b254
+EBUILD openrc-0.13.8.ebuild 10843 SHA256 b2d63a8285e5e650376c871fa419ff4bb36288e05d85bd87b7fa5aa0ff77bd72 SHA512 354cae70300db6fdc3c411e4035ad5178da50c903a065152a71d5a24f59041f71db10c30dcbcf7a8e92c40b3b20b6e0dd468751f59d59f6593eb40f724eafa84 WHIRLPOOL 2be3a35606de189eed2f48a71431f1d7be023ae88529e145d6a0b1e2c8f9b7a666241307fba81915ebe11652de9b9c29d825a4e526657874508dc4b7d36d5ef5
diff --git a/sys-apps/openrc/openrc-0.13.8.ebuild b/sys-apps/openrc/openrc-0.13.8.ebuild
index a16707541..977f793c6 100644
--- a/sys-apps/openrc/openrc-0.13.8.ebuild
+++ b/sys-apps/openrc/openrc-0.13.8.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="debug elibc_glibc ncurses pam newnet pentoo prefix +netifrc selinux static-libs
+IUSE="debug elibc_glibc ncurses pam newnet nfs pentoo prefix +netifrc selinux static-libs
 	tools unicode kernel_linux kernel_FreeBSD"
 
 COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
@@ -46,6 +46,7 @@ RDEPEND="${COMMON_DEPEND}
 		sec-policy/selinux-base-policy
 		sec-policy/selinux-openrc
 	)
+	nfs? ( net-fs/nfs-utils )
 "
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
@@ -58,6 +59,8 @@ src_prepare() {
 		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
 	fi
 
+	epatch "${FILESDIR}"/nfs-fix.patch
+
 	# Allow user patches to be applied without modifying the ebuild
 	epatch_user
 }