diff --git a/fwupd.changes b/fwupd.changes
index 158d951..03bfa22 100644
--- a/fwupd.changes
+++ b/fwupd.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+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>
+
+- Amend %post and %postun to install/uninstall fwupd*.efi to the
+  EFI system partition
+  + Also add shim to Requires for fwupdx64.efi
+- Mark fwupdate as obsolete
+  + fwupdate has been merged into fwupd since fwupd 1.1.0.
+
 -------------------------------------------------------------------
 Mon Nov 12 10:31:09 CET 2018 - ndas@suse.de
 
diff --git a/fwupd.spec b/fwupd.spec
index ab976bf..a7f77d3 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -21,6 +21,11 @@
 %else
 %bcond_with efi_fw_update
 %endif
+%if 0%{?is_opensuse}
+%global efidir opensuse
+%else
+%global efidir sles
+%endif
 Name:           fwupd
 Version:        1.1.2
 Release:        0
@@ -32,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
@@ -53,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
@@ -74,13 +79,19 @@ 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
 BuildRequires:  pkgconfig(libsmbios_c) >= 2.3.0
 %endif
+%if %{with efi_fw_update}
+%ifarch x86_64
+Requires:       shim >= 11
+%endif
+Obsoletes:      fwupdate
+%endif
 
 %description
 fwupd is a daemon to allows session software to update device firmware on
@@ -168,9 +179,25 @@ rm -fr %{buildroot}%{_datadir}/installed-tests
 %post
 %udev_rules_update
 %service_add_post %{name}.service fwupd-offline-update.service
+%if %{with efi_fw_update}
+if [ -d "/boot/efi/EFI/%{efidir}" ]; then
+	# Create the directory for firwmare update capsules
+	mkdir -p /boot/efi/EFI/%{efidir}/fw
+	# Install the UEFI firmware update program
+	cp %{_libexecdir}/fwupd/efi/fwupd*.efi /boot/efi/EFI/%{efidir}
+fi
+%endif
 
 %postun
 %service_del_postun %{name}.service fwupd-offline-update.service
+%if %{with efi_fw_update}
+if [ "$1" = 0 && -d "/boot/efi/EFI/%{efidir}" ] ; then
+	# Remove all capsule files
+	rm -rf /boot/efi/EFI/%{efidir}/fw
+	# Remove the UEFI firmware update program
+	rm -f /boot/efi/EFI/%{efidir}/fwupd*.efi
+fi
+%endif
 
 %files
 %license COPYING
@@ -220,7 +247,9 @@ rm -fr %{buildroot}%{_datadir}/installed-tests
 %{_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/