diff --git a/grub.macros b/grub.macros
index ff5fee36..d35c4e77 100644
--- a/grub.macros
+++ b/grub.macros
@@ -517,7 +517,7 @@ install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3}		\
 install -D -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_boot}/BOOTARM.EFI \
 %endif								\
 install -D -m 700 unicode.pf2					\\\
-	$RPM_BUILD_ROOT%{efi_esp_dir}/fonts/unicode.pf2		\
+	${RPM_BUILD_ROOT}/boot/%{name}/fonts/unicode.pf2		\
 ${RPM_BUILD_ROOT}/%{_bindir}/%{name}-editenv			\\\
 		${RPM_BUILD_ROOT}/boot/%{name}/grubenv create	\
 %{expand:%%do_install_protected_file %{name}-%{package_arch}}	\
@@ -615,7 +615,7 @@ ln -s ../boot/%{name}/grub.cfg					\\\
 %ifarch %{arm}							\
 %attr(0700,root,root)%{efi_esp_boot}/BOOTARM.EFI		\
 %endif								\
-%dir %attr(0700,root,root)%{efi_esp_dir}/fonts			\
+%attr(0700,root,root)/boot/%{name}/fonts			\
 %dir %attr(0700,root,root)/boot/loader/entries			\
 %ghost %config(noreplace) /boot/%{name}/grub.cfg		\
 %ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg	\
@@ -637,5 +637,5 @@ ln -s ../boot/%{name}/grub.cfg					\\\
 %{expand:%%files %{1}-cdboot}					\
 %defattr(0700,root,root,-)					\
 %attr(0700,root,root)%{efi_esp_dir}/%{3}			\
-%attr(0700,root,root)%{efi_esp_dir}/fonts			\
+%attr(0700,root,root)/boot/%{name}/fonts			\
 %{nil}