diff --git a/net-fs/nfs-ganesha/nfs-ganesha-5.9.ebuild b/net-fs/nfs-ganesha/nfs-ganesha-5.9.ebuild
index b27d5c6..b397e9e 100644
--- a/net-fs/nfs-ganesha/nfs-ganesha-5.9.ebuild
+++ b/net-fs/nfs-ganesha/nfs-ganesha-5.9.ebuild
@@ -34,7 +34,7 @@ REQUIRED_USE="gui? ( tools )
 RDEPEND="
 	dev-libs/jemalloc:=
 	dev-libs/userspace-rcu:=
-	>=net-libs/ntirpc-5.0[gssapi]
+	>=net-libs/ntirpc-5.8[gssapi]
 	sys-apps/acl
 	sys-apps/util-linux
 	caps? ( sys-libs/libcap )
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
new file mode 100644
index 0000000..2b7df83
--- /dev/null
+++ b/net-libs/ntirpc/Manifest
@@ -0,0 +1 @@
+DIST ntirpc-5.8.tar.gz 393482 BLAKE2B 82b71ef028c0c05801eae90cb1f0a02c3d18564886471cf900620f6eb83d195936976b3b23bbd23e823348abf97fcec4c713d57004754b5695e5c49956bce4be SHA512 45b8e5639a76012e8ed2c3344432683c1bc3597490e8166961db56bbddd966a227bbf7d9151b1c316f8b96353b4918f4629ddeac480bb50e63430b5661c11ff4
diff --git a/net-libs/ntirpc/metadata.xml b/net-libs/ntirpc/metadata.xml
new file mode 100644
index 0000000..39ab041
--- /dev/null
+++ b/net-libs/ntirpc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="gssapi">Include support for RPCSEC GSS</flag>
+		<flag name="rdma">Include support for RDMA RPC</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">nfs-ganesha/ntirpc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/ntirpc/ntirpc-5.8.ebuild b/net-libs/ntirpc/ntirpc-5.8.ebuild
new file mode 100644
index 0000000..ab8f0e6
--- /dev/null
+++ b/net-libs/ntirpc/ntirpc-5.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
+HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
+SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gssapi rdma"
+
+# Since the GSS option only controls some extra files to be enabled,
+# there's nothing to list in the depend string for it.
+RDEPEND="
+	dev-libs/userspace-rcu:=
+	rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GSS=$(usex gssapi)
+		-DUSE_RPC_RDMA=$(usex rdma)
+	)
+	cmake_src_configure
+}