diff --git a/fwupd.changes b/fwupd.changes
index 7c7d4a0..03bfa22 100644
--- a/fwupd.changes
+++ b/fwupd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec 10 10:17:50 UTC 2018 - schwab@suse.de
+
+- Use gnu-efi only if %{with efi_fw_update}, always use pkgconfig(efivar)
+- Fix file list
+
 -------------------------------------------------------------------
 Thu Dec  6 07:22:17 UTC 2018 - Gary Ching-Pang Lin <glin@suse.com>
 
diff --git a/fwupd.spec b/fwupd.spec
index 1825e52..a7f77d3 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -37,7 +37,6 @@ Source:         %{name}-%{version}.tar.xz
 BuildRequires:  dejavu-fonts
 BuildRequires:  docbook-utils-minimal
 BuildRequires:  gcab
-BuildRequires:  gnu-efi
 # for certtool
 BuildRequires:  gnutls
 BuildRequires:  gobject-introspection
@@ -58,6 +57,7 @@ BuildRequires:  pkgconfig(appstream-glib) >= 0.5.10
 BuildRequires:  pkgconfig(bash-completion)
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(colorhug) >= 1.2.12
+BuildRequires:  pkgconfig(efivar)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.25.9
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.45.8
@@ -79,8 +79,8 @@ BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(valgrind)
 %if %{with efi_fw_update}
+BuildRequires:  gnu-efi
 BuildRequires:  pkgconfig(efiboot)
-BuildRequires:  pkgconfig(efivar)
 BuildRequires:  pkgconfig(fwup) >= 10
 %endif
 %ifarch %{ix86} x86_64
@@ -247,7 +247,9 @@ fi
 %{_libdir}/girepository-1.0/Fwupd-2.0.typelib
 
 %files lang -f %{name}.lang
+%if %{with efi_fw_update}
 %{_datadir}/locale/*/LC_IMAGES/
+%endif
 
 %files devel
 %doc %{_datadir}/gtk-doc/html/libfwupd/