diff --git a/efibootmgr.spec b/efibootmgr.spec
index 1bb3563..694d1b6 100644
--- a/efibootmgr.spec
+++ b/efibootmgr.spec
@@ -3,13 +3,16 @@
 Summary: EFI Boot Manager
 Name: efibootmgr
 Version: 16
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: https://github.com/rhboot/%{name}/
-BuildRequires: efi-rpm-macros git popt-devel
+BuildRequires: efi-srpm-macros >= 3-2
+BuildRequires: efi-filesystem
+BuildRequires: git popt-devel
 BuildRequires: efivar-libs >= %{efivar_version}
 BuildRequires: efivar-devel >= %{efivar_version}
+Requires: efi-filesystem
 ExclusiveArch: %{efi}
 
 # for RHEL / Fedora when efibootmgr was part of the elilo package
@@ -46,6 +49,9 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Fri May 04 2018 Peter Jones <pjones@redhat.com> - 16-3
+- Rebuild for new efi-rpm-macros, now that it has settled down a bit.
+
 * Wed May 02 2018 Peter Jones <pjones@redhat.com> - 16-2
 - Use %%{efi} and similar macros from efi-rpm-macros
 - Use '%%autosetup -S git' now that it imports patches without rewriting