diff --git a/.files b/.files
index 43223fb..731ae28 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index b630333..0b1b3ae 100644
--- a/.rev
+++ b/.rev
@@ -1106,4 +1106,12 @@ vendor &quot;openSUSE&quot;, product &quot;MicroOS&quot; though.</comment>
     <comment>defined build.opensuse.org default repository name in default_obs_repository_name. The default_obs_download_url will get added automatically. You will need to use obs-service-product_converter 1.4.6 for this.</comment>
     <requestid>903235</requestid>
   </revision>
+  <revision rev="153" vrev="151">
+    <srcmd5>3cc6da45ec3c924706a43e8147652fcd</srcmd5>
+    <version>unknown</version>
+    <time>1625867804</time>
+    <user>dimstar_suse</user>
+    <comment>Add support for riscv64</comment>
+    <requestid>904555</requestid>
+  </revision>
 </revisionlist>
diff --git a/defaults-archsets.include b/defaults-archsets.include
index 33fc252..e378cb0 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 e24da1f..bfe83e5 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 1e685fb..ec92d43 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]