diff --git a/dev-debug/rr/rr-5.9.0-r1.ebuild b/dev-debug/rr/rr-5.9.0-r1.ebuild
index d01afceff3b68..fb0f8cd33807e 100644
--- a/dev-debug/rr/rr-5.9.0-r1.ebuild
+++ b/dev-debug/rr/rr-5.9.0-r1.ebuild
@@ -59,6 +59,12 @@ PATCHES=(
 pkg_setup() {
 	if use kernel_linux; then
 		CONFIG_CHECK="SECCOMP"
+
+		if use amd64 ; then
+			CONFIG_CHECK+=" ~X86_MSR"
+			WARNING_X86_MSR="X86_MSR is needed for rr-zen_workaround.py (AMD Zen CPUs)"
+		fi
+
 		linux-info_pkg_setup
 	fi
 	python-single-r1_pkg_setup
diff --git a/dev-debug/rr/rr-9999.ebuild b/dev-debug/rr/rr-9999.ebuild
index d01afceff3b68..fb0f8cd33807e 100644
--- a/dev-debug/rr/rr-9999.ebuild
+++ b/dev-debug/rr/rr-9999.ebuild
@@ -59,6 +59,12 @@ PATCHES=(
 pkg_setup() {
 	if use kernel_linux; then
 		CONFIG_CHECK="SECCOMP"
+
+		if use amd64 ; then
+			CONFIG_CHECK+=" ~X86_MSR"
+			WARNING_X86_MSR="X86_MSR is needed for rr-zen_workaround.py (AMD Zen CPUs)"
+		fi
+
 		linux-info_pkg_setup
 	fi
 	python-single-r1_pkg_setup