diff --git a/llvm-runtimes/clang-runtime/clang-runtime-21.1.8.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-21.1.8.ebuild
index c21a64b31f091..672387652f43a 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-21.1.8.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-21.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,6 +15,7 @@ KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos
 IUSE="
 	+compiler-rt libcxx offload openmp +sanitize
 	default-compiler-rt default-libcxx default-lld llvm-libunwind polly
+	llvm_targets_AMDGPU llvm_targets_NVPTX
 "
 REQUIRED_USE="
 	sanitize? ( compiler-rt )
@@ -32,6 +33,12 @@ RDEPEND="
 		>=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}]
 		offload? (
 			>=llvm-runtimes/offload-${PV}
+			llvm_targets_AMDGPU? (
+				>=llvm-runtimes/offload-${PV}[clang,llvm_targets_AMDGPU(-)]
+			)
+			llvm_targets_NVPTX? (
+				>=llvm-runtimes/offload-${PV}[clang,llvm_targets_NVPTX(-)]
+			)
 		)
 	)
 
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-23-r1.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-23-r1.ebuild
index 3c0e7eaf7c645..137d5c1374acd 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-23-r1.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-23-r1.ebuild
@@ -14,6 +14,7 @@ SLOT="${PV}"
 IUSE="
 	+compiler-rt libcxx offload openmp +sanitize
 	default-compiler-rt default-libcxx default-lld llvm-libunwind polly
+	llvm_targets_AMDGPU llvm_targets_NVPTX llvm_targets_SPIRV
 "
 REQUIRED_USE="
 	sanitize? ( compiler-rt )
@@ -29,6 +30,17 @@ RDEPEND="
 	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
 	openmp? (
 		>=llvm-runtimes/openmp-${PV}[offload?,${MULTILIB_USEDEP}]
+		offload? (
+			llvm_targets_AMDGPU? (
+				>=llvm-runtimes/openmp-${PV}[rocm(-)]
+			)
+			llvm_targets_NVPTX? (
+				>=llvm-runtimes/openmp-${PV}[cuda(-)]
+			)
+			llvm_targets_SPIRV? (
+				>=llvm-runtimes/openmp-${PV}[level-zero(-)]
+			)
+		)
 	)
 
 	llvm-core/clang-common
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 76c5c0295ef58..74e476d68302d 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -23,12 +23,11 @@ media-video/obs-studio -mpegts
 
 # Michał Górny <mgorny@gentoo.org> (2026-03-14)
 # SPIRV target requires dev-libs/level-zero.
-llvm-runtimes/offload -llvm_targets_SPIRV
 llvm-runtimes/openmp -level-zero
 
 # Michał Górny <mgorny@gentoo.org> (2026-03-03)
-# OpenMP offloading GPU runtimes are not keyworded everywhre.
-llvm-runtimes/clang-runtime -llvm_targets_AMDGPU -llvm_targets_NVPTX
+# OpenMP offloading GPU runtimes are not keyworded everywhere.
+llvm-runtimes/clang-runtime -llvm_targets_AMDGPU -llvm_targets_NVPTX -llvm_targets_SPIRV
 
 # Ionen Wolkens <ionen@gentoo.org> (2026-02-11)
 # net-libs/librist is available here
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 49e0c7e109f79..cf5dcbfa23751 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Paul Zander <negril.nx+gentoo@gmail.com> (2026-04-28)
+# SPIRV target requires dev-libs/level-zero.
+llvm-runtimes/openmp level-zero
+
+# Paul Zander <negril.nx+gentoo@gmail.com> (2026-04-28)
+# OpenMP offloading GPU runtimes are not keyworded everywhere.
+llvm-runtimes/clang-runtime llvm_targets_AMDGPU llvm_targets_NVPTX llvm_targets_SPIRV
+
 # Matt Jolly <kangie@gentoo.org> (2026-03-10)
 # mrustc is not yet stable on amd64, but we want bootstrap for Rust
 ~dev-lang/rust-1.90.0 mrustc-bootstrap