diff --git a/net-misc/xmrig/xmrig-6.18.1-r1.ebuild b/net-misc/xmrig/xmrig-6.18.1-r2.ebuild
similarity index 85%
rename from net-misc/xmrig/xmrig-6.18.1-r1.ebuild
rename to net-misc/xmrig/xmrig-6.18.1-r2.ebuild
index 89809b2e8627a..7152c4ad76354 100644
--- a/net-misc/xmrig/xmrig-6.18.1-r1.ebuild
+++ b/net-misc/xmrig/xmrig-6.18.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake systemd
+inherit cmake flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
 HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
@@ -45,6 +45,13 @@ src_prepare() {
 }
 
 src_configure() {
+	# JIT broken with FORTIFY_SOURCE=3
+	# Bug #913420
+	if tc-enables-fortify-source; then
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
 	local mycmakeargs=(
 		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
 		-DWITH_HWLOC=$(usex hwloc)
diff --git a/net-misc/xmrig/xmrig-6.20.0.ebuild b/net-misc/xmrig/xmrig-6.20.0-r1.ebuild
similarity index 84%
rename from net-misc/xmrig/xmrig-6.20.0.ebuild
rename to net-misc/xmrig/xmrig-6.20.0-r1.ebuild
index 7f9e7dd2397c4..a36872e00718e 100644
--- a/net-misc/xmrig/xmrig-6.20.0.ebuild
+++ b/net-misc/xmrig/xmrig-6.20.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake systemd
+inherit cmake flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
 HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
@@ -44,6 +44,13 @@ src_prepare() {
 }
 
 src_configure() {
+	# JIT broken with FORTIFY_SOURCE=3
+	# Bug #913420
+	if tc-enables-fortify-source; then
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
 	local mycmakeargs=(
 		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
 		-DWITH_HWLOC=$(usex hwloc)
diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild
index 7f9e7dd2397c4..a36872e00718e 100644
--- a/net-misc/xmrig/xmrig-9999.ebuild
+++ b/net-misc/xmrig/xmrig-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake systemd
+inherit cmake flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
 HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
@@ -44,6 +44,13 @@ src_prepare() {
 }
 
 src_configure() {
+	# JIT broken with FORTIFY_SOURCE=3
+	# Bug #913420
+	if tc-enables-fortify-source; then
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
 	local mycmakeargs=(
 		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
 		-DWITH_HWLOC=$(usex hwloc)