diff --git a/.efi-rpm-macros.metadata b/.efi-rpm-macros.metadata
new file mode 100644
index 0000000..5bfb0ea
--- /dev/null
+++ b/.efi-rpm-macros.metadata
@@ -0,0 +1 @@
+572ed93a939449ed0f2f0cf7dd0ad4739eb2b9d2 SOURCES/efi-rpm-macros-6.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..599a827
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/efi-rpm-macros-6.tar.bz2
diff --git a/SPECS/efi-rpm-macros.spec b/SPECS/efi-rpm-macros.spec
new file mode 100644
index 0000000..f21c2f1
--- /dev/null
+++ b/SPECS/efi-rpm-macros.spec
@@ -0,0 +1,137 @@
+Summary: Common RPM Macros for building EFI-related packages
+Name: efi-rpm-macros
+Version: 6
+Release: 2%{?dist}
+License: GPLv3+
+URL: https://github.com/rhboot/%{name}/
+BuildRequires: git sed
+BuildRequires: make
+BuildArch: noarch
+
+Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-6.tar.bz2
+
+%global debug_package %{nil}
+%global _efi_vendor_ %(eval echo $(sed -n -e 's/rhel/redhat/' -e 's/^ID=//p' /etc/os-release))
+
+%description
+%{name} provides a set of RPM macros for use in EFI-related packages.
+
+%package -n efi-srpm-macros
+Summary: Common SRPM Macros for building EFI-related packages
+BuildArch: noarch
+Requires: rpm
+
+%description -n efi-srpm-macros
+efi-srpm-macros provides a set of SRPM macros for use in EFI-related packages.
+
+%package -n efi-filesystem
+Summary: The basic directory layout for EFI machines
+BuildArch: noarch
+Requires: filesystem
+
+%description -n efi-filesystem
+The efi-filesystem package contains the basic directory layout for EFI
+machine bootloaders and tools.
+
+%prep
+%autosetup -S git_am -n %{name}-6
+git config --local --add efi.vendor "%{_efi_vendor_}"
+git config --local --add efi.esp-root /boot/efi
+git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
+
+%build
+%make_build clean all
+
+%install
+%make_install
+
+#%%files
+#%%{!?_licensedir:%%global license %%%%doc}
+#%%license LICENSE
+#%%doc README
+#%%{_rpmmacrodir}/macros.efi
+
+%files -n efi-srpm-macros
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README
+%{_rpmmacrodir}/macros.efi-srpm
+%{_rpmconfigdir}/brp-boot-efi-times
+
+%files -n efi-filesystem
+%defattr(0700,root,root,-)
+%verify(not mode) %dir /boot/efi
+%verify(not mode) %dir /boot/efi/EFI
+%verify(not mode) %dir /boot/efi/EFI/BOOT
+%verify(not mode) %dir /boot/efi/EFI/%{_efi_vendor_}
+
+%changelog
+* Thu Apr 14 2022 Peter Jones <pjones@redhat.com> - 6-1
+- Disable ia32 as an alt for x86_64
+  Related: rhbz#1932057
+
+* Mon Nov 08 2021 Robbie Harwood <rharwood@redhat.com> - 4-9
+- Ignore the mode bits when doing RPM verification of files in /boot/efi
+- Resolves: rhbz#1936384
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4-8
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 4-7
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Sep 26 2018 Peter Jones <pjones@redhat.com> - 4-1
+- Provide %%{efi_build_requires} and brp-boot-efi-times
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri May 04 2018 Peter Jones <pjones@redhat.com> - 3-2
+- Always provide macros for efi_arch and efi_alt_arch (and their _upper
+  variants), and make efi_has_arch and efi_has_alt_arch 0 when they will be
+  wrong.  This ensures everything can always expand when we're on a non-efi
+  architecture.
+
+* Fri May 04 2018 Peter Jones <pjones@redhat.com> - 3-1
+- Update to version 3 to try and un-break rawhide composes due to
+  ExclusiveArch constraints.
+
+* Thu May 03 2018 Peter Jones <pjones@redhat.com> - 2-6
+- Rework the macros for better srpm use.
+
+* Wed May 02 2018 Peter Jones <pjones@redhat.com> - 2-5
+- Add efi-filesystem subpackage
+
+* Wed May 02 2018 Peter Jones <pjones@redhat.com> - 2-4
+- Add %%{efi_has_alt_arch}
+
+* Tue May 01 2018 Peter Jones <pjones@redhat.com> - 2-3
+- Make an efi-srpm-macros subpackage to pull in so %%{efi} works in
+  ExclusiveArch in koji.
+
+* Tue May 01 2018 Peter Jones <pjones@redhat.com> - 2-2
+- Fix the non-efi and non-efi-alt-arch cases, hopefully.
+- Make efi-*-macros packages not be ExclusiveArch, because they need to work
+  in non-efi-arch packages.
+
+* Tue May 01 2018 Peter Jones <pjones@redhat.com> - 2-1
+- Lots of rpmlint fixups and the like.
+
+* Mon Apr 30 2018 Peter Jones <pjones@redhat.com> - 1-1
+- First shot at building it.