diff --git a/appliance-tools.spec b/appliance-tools.spec
index 80a52fd..c194b08 100644
--- a/appliance-tools.spec
+++ b/appliance-tools.spec
@@ -21,12 +21,14 @@
 Name: appliance-tools
 Summary: Tools for building Appliances
 Version: 011.2
-Release: 5%{?dist}
+Release: 5.0.riscv64%{?dist}
 License: GPLv2
 URL: https://pagure.io/appliance-tools
 
 Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 
+Patch0: detect-grub2-riscv64.patch
+
 # Ensure system deps are installed (rhbz#1409536)
 Requires: python%{python_pkgversion}-imgcreate %{?min_imgcrate_evr:>= %{min_imgcreate_evr}}
 Requires: python%{python_pkgversion}-progress
@@ -76,6 +78,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %{python_sitelib}/ec2convert/
 
 %changelog
+* Tue Sep 26 2023 David Abdurachmanov <davidlt@rivosinc.com> - 011.2-5.0.riscv64
+- Detect grub2 on riscv64
+
 * Sun Aug 13 2023 Neal Gompa <ngompa@fedoraproject.org> - 011.2-5
 - Add runtime dep for setuptools (#2135410)
 
diff --git a/detect-grub2-riscv64.patch b/detect-grub2-riscv64.patch
new file mode 100644
index 0000000..2fca9a2
--- /dev/null
+++ b/detect-grub2-riscv64.patch
@@ -0,0 +1,14 @@
+diff --git a/appcreate/appliance.py b/appcreate/appliance.py
+index e9ff5bf..1a7bcde 100644
+--- a/appcreate/appliance.py
++++ b/appcreate/appliance.py
+@@ -206,6 +206,9 @@ class ApplianceImageCreator(ImageCreator):
+                 elif 'grub2-efi-aa64' in packages:
+                     self.bootloader = 'grub2'
+                     self.grub2inst_may_fail = True
++                elif 'grub2-efi-riscv64' in packages:
++                    self.bootloader = 'grub2'
++                    self.grub2inst_may_fail = True
+                 elif 'grub2-efi-ia32' in packages:
+                     self.bootloader = 'grub2'
+                     self.grub2inst_may_fail = True