diff --git a/systemd-mini.spec b/systemd-mini.spec
index ef9bef48..6711ee93 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -75,6 +75,9 @@ BuildRequires:  pkgconfig(mount) >= 2.26
 %ifarch %ix86 x86_64 x32 %arm ppc64le s390x
 BuildRequires:  pkgconfig(libseccomp)
 %endif
+%ifarch %{ix86} x86_64
+BuildRequires:  gnu-efi
+%endif
 BuildRequires:  pkgconfig(libselinux) >= 2.1.9
 BuildRequires:  pkgconfig(libsepol)
 Conflicts:      sysvinit
@@ -96,9 +99,6 @@ BuildRequires:  pkgconfig(libcryptsetup) >= 1.6.0
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libqrencode)
 BuildRequires:  pkgconfig(usbutils) >= 0.82
-%ifarch %{ix86} x86_64
-BuildRequires:  gnu-efi
-%endif
 # the buildignore is important for bootstrapping
 #!BuildIgnore:  udev
 Requires:       udev >= 172
@@ -1143,7 +1143,9 @@ exit 0
 %{_bindir}/networkctl
 %endif
 %{_bindir}/busctl
+%if !0%{?bootstrap}
 %{_bindir}/bootctl
+%endif
 %{_bindir}/kernel-install
 %{_bindir}/hostnamectl
 %{_bindir}/localectl
diff --git a/systemd.spec b/systemd.spec
index eb3c16ff..99f9e754 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -70,6 +70,9 @@ BuildRequires:  pkgconfig(mount) >= 2.26
 %ifarch %ix86 x86_64 x32 %arm ppc64le s390x
 BuildRequires:  pkgconfig(libseccomp)
 %endif
+%ifarch %{ix86} x86_64
+BuildRequires:  gnu-efi
+%endif
 BuildRequires:  pkgconfig(libselinux) >= 2.1.9
 BuildRequires:  pkgconfig(libsepol)
 Conflicts:      sysvinit
@@ -91,9 +94,6 @@ BuildRequires:  pkgconfig(libcryptsetup) >= 1.6.0
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libqrencode)
 BuildRequires:  pkgconfig(usbutils) >= 0.82
-%ifarch %{ix86} x86_64
-BuildRequires:  gnu-efi
-%endif
 # the buildignore is important for bootstrapping
 #!BuildIgnore:  udev
 Requires:       udev >= 172
@@ -1138,7 +1138,9 @@ exit 0
 %{_bindir}/networkctl
 %endif
 %{_bindir}/busctl
+%if !0%{?bootstrap}
 %{_bindir}/bootctl
+%endif
 %{_bindir}/kernel-install
 %{_bindir}/hostnamectl
 %{_bindir}/localectl