diff --git a/defaults-archsets.include b/defaults-archsets.include
index 6f7b729..5c20a90 100644
--- a/defaults-archsets.include
+++ b/defaults-archsets.include
@@ -60,6 +60,11 @@
         <arch>noarch</arch>
       </archset>
 
+      <archset name="riscv64" productarch="riscv64">
+        <arch>riscv64</arch>
+        <arch>noarch</arch>
+      </archset>
+
 
     </archsets>
 
diff --git a/defaults-conditionals.include b/defaults-conditionals.include
index 3de0bfd..ec8be70 100644
--- a/defaults-conditionals.include
+++ b/defaults-conditionals.include
@@ -51,5 +51,8 @@
 	<conditional name="only_s390x">
 		<platform arch="s390x" />
 	</conditional>
+	<conditional name="only_riscv64">
+		<platform arch="riscv64" />
+	</conditional>
     </conditionals>
 
diff --git a/groups.yml b/groups.yml
index a387b18..1f4a6c7 100644
--- a/groups.yml
+++ b/groups.yml
@@ -47,6 +47,7 @@ dvd:
   - grub2-i386-pc: [x86_64,i586]
   - grub2-arm64-efi: [aarch64]
   - grub2-arm-efi: [armv7l]
+  - grub2-riscv64-efi: [riscv64]
   - shim: [x86_64,aarch64]
   - patterns-gnome-gnome: [required,suggested]
   - patterns-gnome-gnome_basis: [required,suggested]