diff --git a/.efi-rpm-macros.metadata b/.efi-rpm-macros.metadata
new file mode 100644
index 0000000..c14d5bc
--- /dev/null
+++ b/.efi-rpm-macros.metadata
@@ -0,0 +1 @@
+0c71e8e1736ec1f3d79e0d5757b178c66eed4ccb efi-rpm-macros-4.tar.bz2
diff --git a/efi-rpm-macros.spec b/efi-rpm-macros.spec
index d2bae55..652d84c 100644
--- a/efi-rpm-macros.spec
+++ b/efi-rpm-macros.spec
@@ -1,7 +1,7 @@
 Summary: Common RPM Macros for building EFI-related packages
 Name: efi-rpm-macros
 Version: 4
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv3+
 URL: https://github.com/rhboot/%{name}/
 BuildRequires: git sed
@@ -60,12 +60,16 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
 
 %files -n efi-filesystem
 %defattr(0700,root,root,-)
-%dir /boot/efi
-%dir /boot/efi/EFI
-%dir /boot/efi/EFI/BOOT
-%dir /boot/efi/EFI/%{_efi_vendor_}
+%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
+* 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