diff --git a/grub2-mkconfig-riscv64.patch b/grub2-mkconfig-riscv64.patch
new file mode 100644
index 0000000..c9bd334
--- /dev/null
+++ b/grub2-mkconfig-riscv64.patch
@@ -0,0 +1,12 @@
+Index: grub-2.04/util/grub.d/10_linux.in
+===================================================================
+--- grub-2.04.orig/util/grub.d/10_linux.in
++++ grub-2.04/util/grub.d/10_linux.in
+@@ -216,6 +216,7 @@ case "x$machine" in
+     xi?86 | xx86_64) klist="/boot/vmlinuz-* /vmlinuz-* /boot/kernel-*" ;;
+     xaarch64) klist="/boot/Image-* /Image-* /boot/kernel-*" ;;
+     xarm*) klist="/boot/zImage-* /zImage-* /boot/kernel-*" ;;
++    xriscv64) klist="/boot/Image-* /Image-* /boot/kernel-*" ;;
+     xs390 | xs390x)  klist="/boot/image-* /boot/kernel-*" ;;
+     *) klist="/boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* \
+ 		/boot/kernel-*" ;;
diff --git a/grub2.changes b/grub2.changes
index 59f5870..8cec8c4 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 31 19:09:33 UTC 2023 - Andreas Schwab <schwab@suse.de>
+
+- grub2-mkconfig-riscv64.patch: Handle riscv64 in mkconfig
+
 -------------------------------------------------------------------
 Wed Aug 16 06:59:35 UTC 2023 - Gary Ching-Pang Lin <glin@suse.com>
 
diff --git a/grub2.spec b/grub2.spec
index 2ce1347..c235ed6 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -373,6 +373,7 @@ Patch185:       0001-protectors-Implement-NV-index.patch
 Patch186:       0002-cryptodisk-Fallback-to-passphrase.patch
 Patch187:       0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
 Patch188:       0004-diskfilter-look-up-cryptodisk-devices-first.patch
+Patch189:       grub2-mkconfig-riscv64.patch
 
 Requires:       gettext-runtime
 %if 0%{?suse_version} >= 1140