diff --git a/rear.spec b/rear.spec
index ee14054..7ad068d 100644
--- a/rear.spec
+++ b/rear.spec
@@ -64,6 +64,7 @@ Patch206: rear-nbu-RHEL-17390-RHEL-17393.patch
 ### Dependencies on all distributions
 BuildRequires:   asciidoc
 BuildRequires:   git-core
+BuildRequires:   efi-srpm-macros
 Requires:   binutils
 Requires:   ethtool
 Requires:   gzip
@@ -96,9 +97,13 @@ Requires:   dhcp-client
 %ifarch x86_64 i686
 Requires: syslinux
 %endif
-%ifarch x86_64 i686 aarch64
+# See https://github.com/rhboot/efi-rpm-macros/blob/main/README
+%ifarch %{efi}
 # We need mkfs.vfat for recreating EFI System Partition
 Recommends: dosfstools
+# Needed for ISO image creation
+Recommends: grub2-efi-%{efi_arch}-modules
+Recommends: grub2-tools-extra
 %endif
 %ifarch ppc ppc64
 Requires:   yaboot