diff --git a/sys-kernel/msr-safe/Manifest b/sys-kernel/msr-safe/Manifest
new file mode 100644
index 0000000000..1cfde155c0
--- /dev/null
+++ b/sys-kernel/msr-safe/Manifest
@@ -0,0 +1 @@
+DIST msr-safe-1.6.0.gh.tar.gz 56916 BLAKE2B 1bd22f98959bc1290954fe67b2de8c7916880d30ca9452850489248c5e6cab2abf1b61319a36aaa690deba0cdbd6c9b4a7bc9e4d07d2d1ea416d2eb61ea52f22 SHA512 ad5ceb8f24a1dc80d3ea25a654ed76bbf3bc109f6c0e17c582ca2ab8fd5abdaa369d88478375e42ec456ca3b9a2c65d6abea1a86c9eca45450b9795c575c8064
diff --git a/sys-kernel/msr-safe/metadata.xml b/sys-kernel/msr-safe/metadata.xml
new file mode 100644
index 0000000000..bc3f7d35a1
--- /dev/null
+++ b/sys-kernel/msr-safe/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">LLNL/msr-safe</remote-id>
+	</upstream>
+	<use>
+		<flag name="slurm">Install the spank plugin</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-kernel/msr-safe/msr-safe-1.6.0.ebuild b/sys-kernel/msr-safe/msr-safe-1.6.0.ebuild
new file mode 100644
index 0000000000..e382df77b9
--- /dev/null
+++ b/sys-kernel/msr-safe/msr-safe-1.6.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod systemd udev
+
+DESCRIPTION="Allows safer access to model specific registers (MSRs)"
+HOMEPAGE="https://github.com/LLNL/msr-safe"
+SRC_URI="https://github.com/LLNL/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="slurm"
+
+DEPEND="slurm? ( sys-cluster/slurm )"
+RDEPEND="
+	${DEPEND}
+	virtual/udev
+"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="msr-safe(misc:${S})"
+
+src_compile() {
+#	export KV_FULL
+	linux-mod_src_compile
+	use slurm && emake spank
+}
+
+src_install() {
+	linux-mod_src_install
+	DESTDIR="${D}" libdir="$(get_libdir)" prefix="/usr" emake install
+	use slurm && DESTDIR="${D}" libdir="$(get_libdir)" prefix="/usr" emake install-spank
+	dodoc README.md
+	systemd_dounit rpm/msr-safe.service
+	newsbin rpm/msr-safe.sh msr-safe
+	udev_dorules rpm/10-msr-safe.rules
+	insinto /etc/sysconfig
+	newins rpm/msr-safe.sysconfig msr-safe
+	insinto /usr/share/msr-safe
+	doins -r allowlists
+}
+
+pkg_postrm() {
+	udev_reload
+}