diff --git a/grub.macros b/grub.macros
index 74f71142d17c9e21d7dd784c239a39a72f2a671e..0031e53501e8b79c5adc2c927347b8a2560fb760 100644
--- a/grub.macros
+++ b/grub.macros
@@ -97,7 +97,7 @@
 %endif
 
 
-%global efi_only aarch64 %{arm}
+%global efi_only aarch64 %{arm} riscv64
 %global efi_arch x86_64 ia64 %{efi_only}
 %ifarch %{efi_arch}
 %global with_efi_arch 1
@@ -115,13 +115,13 @@
 %{?with_efi_only:%global without_efi_only 1}
 
 ### fixme
-%ifarch aarch64 %{arm}
+%ifarch aarch64 %{arm} riscv64
 %global efi_modules " "
 %else
 %global efi_modules " backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard "
 %endif
 
-%ifarch aarch64 %{arm}
+%ifarch aarch64 %{arm} riscv64
 %global legacy_provides -l
 %endif
 
@@ -168,6 +168,14 @@
 %global package_arch efi-aa64
 %endif
 
+%ifarch riscv64
+%global emuarch riscv64
+%global efiarch riscv64
+%global target_cpu_name riscv64
+%global grub_target_name riscv64-efi
+%global package_arch efi-riscv64
+%endif
+
 %ifarch %{arm}
 %global efiarch arm
 %global target_cpu_name arm
@@ -392,7 +400,7 @@ install -m 644 %{1}.conf ${RPM_BUILD_ROOT}/etc/dnf/protected.d/ \
 rm -f %{1}.conf							\
 %{nil}
 
-%ifarch x86_64 aarch64 %{arm}
+%ifarch x86_64 aarch64 %{arm} riscv64
 %define mkimage()						\
 %{4}./grub-mkimage -O %{1} -o %{2}.orig				\\\
 	-p /EFI/%{efi_vendor} -d grub-core ${GRUB_MODULES}	\\\
diff --git a/grub2.spec b/grub2.spec
index 89dcbdfb97965337511a77198e6d0ccab316f509..5d9431a50e74e78e693b41ef6f52f9362a42356e 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -14,7 +14,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	5
+Release:	6
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -432,6 +432,9 @@ fi
 %{_datadir}/man/man*
 
 %changelog
+* Wed Jan 12 2022 lvxiaoqian<xiaoqian@nj.iscas.ac.cn> - 2.06-6
+- update grub.macros for riscv
+	
 * Thu Apr 14 2022 zhangqiumiao <zhangqiumiao1@huawei.com> - 2.06-5
 - Type:bugfix
 - CVE:NA