diff --git a/rear.spec b/rear.spec
index 2e6bbfb..112daf7 100644
--- a/rear.spec
+++ b/rear.spec
@@ -113,8 +113,14 @@ ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 s390x
 # see the GitHub issue https://github.com/rear/rear/issues/629
 %ifarch %ix86 x86_64
 Requires: syslinux
+%endif
+# 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 ppc64le
 # Called by grub2-install (except on PowerNV)
@@ -132,6 +138,7 @@ Requires:   s390utils-core
 # (in addition to the default installed bootloader grub2) while on ppc ppc64 the
 # default installed bootloader yaboot is also useed to make the bootable ISO image.
 
+BuildRequires: efi-srpm-macros
 # Required for HTML user guide
 BuildRequires: make
 BuildRequires: asciidoctor