diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index 74d4c972cf7..9fc7afac897 100644
--- a/main/grub/APKBUILD
+++ b/main/grub/APKBUILD
@@ -64,6 +64,7 @@ source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz
 	0021-Alpine-Linux-fixes-for-menu.patch
 	0022-templates-fix-lang-locale-detection.patch
 	0023-build-force-no-pie.patch
+	fix-riscv64.patch
 	"
 
 # secfixes:
@@ -299,4 +300,5 @@ b69a24bf6d19fc262108d6064555754c8662ba1b8e4f68717419acafc18c5e04117c01bd40da3a72
 483d3aae4e3f943b203823be15fa225e943a7fc077f4c4cc59114fd21e16b237a2afd4499e7b6b373618c2551da1ed43c9ecddf9ec09103770d8726ad2b20241  0021-Alpine-Linux-fixes-for-menu.patch
 d4e311ed2a849d9424eb215b55e217e7c0db80b54c7dc67679eb1ec81892e4dff77d4e837abbd17117c2ae6378a6bd06b0d57d2b4856d4045feafe1be43c2067  0022-templates-fix-lang-locale-detection.patch
 552a0034b4f721d56b3ad7eb23b47b278690c219ba1a12fbf1f82eb88b03132c0b73fe11934f7ab26e7e2c819f1c20f06422ae2df26dbeaec8f0eaa3dfd4f03d  0023-build-force-no-pie.patch
+e2a968890fb54f5a070e1de0a30ae6f0a71952ce5f607bfc43798852398142e342e1477b2b51d74f06ad83f49c35f3c81f6c8c9f9d012bc4a327c266a520124f  fix-riscv64.patch
 "
diff --git a/main/grub/fix-riscv64.patch b/main/grub/fix-riscv64.patch
new file mode 100644
index 00000000000..07912db65a9
--- /dev/null
+++ b/main/grub/fix-riscv64.patch
@@ -0,0 +1,22 @@
+diff --git a/include/grub/riscv64/linux.h b/include/grub/riscv64/linux.h
+index 88d5df781..a1222a207 100644
+--- a/include/grub/riscv64/linux.h
++++ b/include/grub/riscv64/linux.h
+@@ -19,6 +19,9 @@
+ #ifndef GRUB_RISCV64_LINUX_HEADER
+ #define GRUB_RISCV64_LINUX_HEADER 1
+ 
++#include <grub/types.h>
++#include <grub/efi/pe32.h>
++
+ #define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x05435352 /* 'RSC\0x5' */
+ 
+ #define GRUB_EFI_PE_MAGIC	0x5A4D
+@@ -37,6 +40,7 @@ struct linux_riscv_kernel_header
+   grub_uint64_t res3;		/* reserved */
+   grub_uint32_t magic;		/* Magic number, little endian, "RSC\x05" */
+   grub_uint32_t hdr_offset;	/* Offset of PE/COFF header */
++  struct grub_pe_image_header pe_image_header;
+ };
+ 
+ #define linux_arch_kernel_header linux_riscv_kernel_header