diff --git a/systemd-mini.changes b/systemd-mini.changes
index 21cf4200..57433928 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 11 21:59:29 UTC 2014 - crrodriguez@opensuse.org
+
+- Do not build EFI support code in architectures on which 
+  the kernel does not support CONFIG_EFI, it won't work.
+  (ia64 also supports it, but that's dead so is not included)
+
 -------------------------------------------------------------------
 Wed Jun 11 14:09:30 UTC 2014 - werner@suse.de
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 561b0d77..b263d4a0 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -26,6 +26,11 @@
 %bcond_without  compat_libs
 %bcond_with     networkd
 %bcond_with     python
+%ifarch %{ix86} x86_64 aarch64
+%define has_efi 1
+%else
+%define has_efi 0
+%endif
 
 Name:           systemd-mini
 Url:            http://www.freedesktop.org/wiki/Software/systemd
@@ -1191,6 +1196,9 @@ cflags -Wl,--hash-size=8599	LDFLAGS
   --disable-static \
 %if 0%{?suse_version} <= 1310
   --with-firmware-path="%{_prefix}/lib/firmware:/lib/firmware" \
+%endif
+%if ! 0%{has_efi}
+  --disable-efi \
 %endif
   --with-rc-local-script-path-start=/etc/init.d/boot.local \
   --with-rc-local-script-path-stop=/etc/init.d/halt.local \
@@ -1647,7 +1655,6 @@ exit 0
 /bin/systemd-ask-password
 /bin/systemctl
 %{_bindir}/systemd-sleep-grub
-%{_bindir}/bootctl
 %{_bindir}/busctl
 %{_bindir}/kernel-install
 %{_bindir}/hostnamectl
@@ -1735,7 +1742,10 @@ exit 0
 %if ! 0%{?bootstrap}
 %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
 %endif
+%if 0%{has_efi}
+%{_bindir}/bootctl
 %{_prefix}/lib/systemd/system-generators/systemd-efi-boot-generator
+%endif
 %{_prefix}/lib/systemd/system-generators/systemd-getty-generator
 %{_prefix}/lib/systemd/system-generators/systemd-rc-local-generator
 %{_prefix}/lib/systemd/system-generators/systemd-fstab-generator
diff --git a/systemd.changes b/systemd.changes
index 21cf4200..57433928 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 11 21:59:29 UTC 2014 - crrodriguez@opensuse.org
+
+- Do not build EFI support code in architectures on which 
+  the kernel does not support CONFIG_EFI, it won't work.
+  (ia64 also supports it, but that's dead so is not included)
+
 -------------------------------------------------------------------
 Wed Jun 11 14:09:30 UTC 2014 - werner@suse.de
 
diff --git a/systemd.spec b/systemd.spec
index 2e056141..c5edaa01 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -24,6 +24,11 @@
 %bcond_without  compat_libs
 %bcond_with     networkd
 %bcond_with     python
+%ifarch %{ix86} x86_64 aarch64
+%define has_efi 1
+%else
+%define has_efi 0
+%endif
 
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
@@ -1186,6 +1191,9 @@ cflags -Wl,--hash-size=8599	LDFLAGS
   --disable-static \
 %if 0%{?suse_version} <= 1310
   --with-firmware-path="%{_prefix}/lib/firmware:/lib/firmware" \
+%endif
+%if ! 0%{has_efi}
+  --disable-efi \
 %endif
   --with-rc-local-script-path-start=/etc/init.d/boot.local \
   --with-rc-local-script-path-stop=/etc/init.d/halt.local \
@@ -1642,7 +1650,6 @@ exit 0
 /bin/systemd-ask-password
 /bin/systemctl
 %{_bindir}/systemd-sleep-grub
-%{_bindir}/bootctl
 %{_bindir}/busctl
 %{_bindir}/kernel-install
 %{_bindir}/hostnamectl
@@ -1730,7 +1737,10 @@ exit 0
 %if ! 0%{?bootstrap}
 %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
 %endif
+%if 0%{has_efi}
+%{_bindir}/bootctl
 %{_prefix}/lib/systemd/system-generators/systemd-efi-boot-generator
+%endif
 %{_prefix}/lib/systemd/system-generators/systemd-getty-generator
 %{_prefix}/lib/systemd/system-generators/systemd-rc-local-generator
 %{_prefix}/lib/systemd/system-generators/systemd-fstab-generator