diff --git a/efibootmgr.spec b/efibootmgr.spec
index bcbd077..27823fc 100644
--- a/efibootmgr.spec
+++ b/efibootmgr.spec
@@ -1,9 +1,9 @@
-%define efivar_version 30-3
+%define efivar_version 31-1
 
 Summary: EFI Boot Manager
 Name: efibootmgr
-Version: 14
-Release: 4%{?dist}
+Version: 15
+Release: 1%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://github.com/rhinstaller/%{name}/
@@ -20,6 +20,8 @@ Obsoletes: elilo <= 3.6-6
 
 Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
 
+%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
+
 %description
 %{name} displays and allows the user to edit the Intel Extensible
 Firmware Interface (EFI) Boot Manager variables.  Additional
@@ -38,11 +40,14 @@ git config --unset user.email
 git config --unset user.name
 
 %build
-make %{?_smp_mflags} EXTRA_CFLAGS='%{optflags}'
+make %{?_smp_mflags} EXTRA_CFLAGS='%{optflags}' EFIDIR=%{efidir}
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+%make_install EFIDIR=%{efidir} libdir=%{_libdir} \
+       bindir=%{_bindir} mandir=%{_mandir} localedir=%{_datadir}/locale/ \
+       includedir=%{_includedir} libexecdir=%{_libexecdir} \
+       datadir=%{_datadir}
 
 %clean
 rm -rf %{buildroot}
@@ -56,6 +61,15 @@ rm -rf %{buildroot}
 %doc README
     
 %changelog
+* Mon Mar 13 2017 Peter Jones <pjones@redhat.com> - 15-1
+- Update to efibootmgr 15
+- Make efibootmgr use EFIDIR / efibootmgr.efidir like fwupdate does
+- make --loader default build-time configurable
+- sanitize set_mirror()/get_mirror()
+- Add support for parsing loader options as UCS2
+- GCC 7 fixes
+- Don't use -fshort-wchar since we don't run on EFI machines.
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 920a962..1faa1f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f74e87963c2c5cb1bf6d588675dbd9b4  efibootmgr-14.tar.bz2
+SHA512 (efibootmgr-15.tar.bz2) = d9d9eef14d373d5da88141e8105f754fea4c039755ed0a0cb9b3c9c2bb285733ad930fd912df42075fe2cf750585699307b067f594d8e65269b3b8a5a00b1cd1