diff --git a/efi-rpm-macros.spec b/efi-rpm-macros.spec
index 652d84c..001af03 100644
--- a/efi-rpm-macros.spec
+++ b/efi-rpm-macros.spec
@@ -1,14 +1,14 @@
 Summary: Common RPM Macros for building EFI-related packages
 Name: efi-rpm-macros
-Version: 4
-Release: 9%{?dist}
+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}-4.tar.bz2
+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))
@@ -34,7 +34,7 @@ The efi-filesystem package contains the basic directory layout for EFI
 machine bootloaders and tools.
 
 %prep
-%autosetup -S git -n %{name}-4
+%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}"
@@ -66,6 +66,10 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
 %verify(not mode) %dir /boot/efi/EFI/%{_efi_vendor_}
 
 %changelog
+* Mon Jul 29 2024 Nicolas Frayer <nfrayer@redhat.com> - 6-2
+- Picked 9b9b4c7dde2e and 32cfff131279 from rhel 9.0 to update nvr
+- Resolves: #RHEL-50842
+
 * 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
diff --git a/sources b/sources
index ce2c756..32e5389 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (efi-rpm-macros-4.tar.bz2) = 0c580902ec053d3bac167086a70fefd5785ddfd93873a48bb7801ab287b2b7af9db325a1f6e3609ad996656cfff713f741f911d012e89b48250ae108fedb789c
+SHA512 (efi-rpm-macros-6.tar.bz2) = 2c5dcf96af549e519665082519c877f5379b3df0a341990ddea52c98e6e0e34495e0996513522b7facc1812d707cca90bd18dbbb75869b29b869716591867015