diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index ca59467c0c111..8c8fe3cebf0b0 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1 +1,2 @@
 DIST xf86-video-amdgpu-21.0.0.tar.bz2 448400 BLAKE2B c7a90606b37b646b946f76d083b3d59755df331ffb7e83e4e65a821a8c0e556504b20207d6bb86e80ea98646184549b6388727df543e1e2cbab37600e243fa72 SHA512 44ccc8ddc36f09d1608cf58b6cf85dda090671c46c5643e9453f7d67f4d6850c3c9753eba43539d45773198b8042898a50153b5225780e4b2852410c5521314a
+DIST xf86-video-amdgpu-22.0.0.tar.xz 376956 BLAKE2B 30936b45cce499791272e9194d5180c208e5159d1b3643ce6f261b2e92a30127a55096cdb07391cb4e91b9b47bbc9a4c5673ee66bdca5cd6f86fc74c7e3d6077 SHA512 95c64e3fef7729ced6e7adc5e81c60cc218f6d8b6604f7b290e86ff52c917426b5102decbf8be8a66c9181ccde6e5dff7083dca8cc0c493a39e82625b5c7cb2a
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-22.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-22.0.0.ebuild
new file mode 100644
index 0000000000000..1ec692c83e1c8
--- /dev/null
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-22.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+XORG_DRI="always"
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
+
+IUSE="udev"
+
+RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu]
+	x11-base/xorg-server[-minimal]
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		--enable-glamor
+		$(use_enable udev)
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
index 813a3cda17acd..1ec692c83e1c8 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 XORG_DRI="always"
+XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"