diff --git a/app-containers/nvidia-container-toolkit/Manifest b/app-containers/nvidia-container-toolkit/Manifest
index e3e3152460..a8eb6598bc 100644
--- a/app-containers/nvidia-container-toolkit/Manifest
+++ b/app-containers/nvidia-container-toolkit/Manifest
@@ -1 +1,2 @@
 DIST nvidia-container-toolkit-1.14.6.tar.gz 2419037 BLAKE2B 6d0dc186a49b2d1cb09fda3f3c4e3361e22f8891cba96cfaa14f2b70f887040b5b637125f7581159aa4a3e0f4c0542f0899e1d0708806767091a9cc34828deac SHA512 710ccaf80b358c3c420cfc00d34eb9a932feff058de911b87783211a30011af01016047f9e62f055d805234d602cf3bbb2b593825fde2a6f00aa505fea7f3719
+DIST nvidia-container-toolkit-1.16.1.tar.gz 2642534 BLAKE2B 0b286accab4b6730b1e3b15a726bc5e20ffae9b6816f0fb840013291fdbf9151cd39d8a8e7a97697113c0c4ec88c9fc9e9551e66ec1c3fb61dfa76e31bc41f44 SHA512 691d4fc47ea60b730ec491b333aa8118bcfd62cdab20a42b84155c6a13484d920e758435b5029bbae4fbefce82352aa5764f1554992682f689c95615809fb83c
diff --git a/app-containers/nvidia-container-toolkit/files/extldflags-1.16.1.patch b/app-containers/nvidia-container-toolkit/files/extldflags-1.16.1.patch
new file mode 100644
index 0000000000..ebc31ca374
--- /dev/null
+++ b/app-containers/nvidia-container-toolkit/files/extldflags-1.16.1.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -60,7 +60,7 @@
+ cmds: $(CMD_TARGETS)
+ 
+ ifneq ($(shell uname),Darwin)
+-EXTLDFLAGS = -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files
++EXTLDFLAGS = -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files -Wl,-z,lazy
+ else
+ EXTLDFLAGS = -Wl,-undefined,dynamic_lookup
+ endif
diff --git a/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-1.16.1.ebuild b/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-1.16.1.ebuild
new file mode 100644
index 0000000000..546d3b1a26
--- /dev/null
+++ b/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-1.16.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGO_PN="github.com/NVIDIA/${PN}"
+
+inherit go-module
+
+DESCRIPTION="NVIDIA container runtime toolkit"
+HOMEPAGE="https://github.com/NVIDIA/nvidia-container-toolkit"
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/NVIDIA/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+
+# Some tests may require specific environmental setups or additional hardware.
+RESTRICT="test" # Bug 831702
+
+RDEPEND="
+	sys-libs/libnvidia-container:0/${PV}
+"
+
+PATCHES=(
+	"${FILESDIR}/extldflags-1.16.1.patch"
+)
+
+src_compile() {
+	emake binaries
+}
+
+src_install() {
+	# Fixed by https://github.com/vizv
+	dobin "nvidia-container-runtime"
+	dobin "nvidia-container-runtime-hook"
+	dobin "nvidia-ctk"
+	insinto "/etc/nvidia-container-runtime"
+	doins "${FILESDIR}/config.toml"
+}
+
+pkg_postinst() {
+	elog "Your docker service must restart after install this package."
+	elog "OpenRC: sudo rc-service docker restart"
+	elog "systemd: sudo systemctl restart docker"
+	elog "You may need to edit your /etc/nvidia-container-runtime/config.toml"
+	elog "file before running ${PN} for the first time."
+	elog "For details, please see the NVIDIA docker manual page."
+}