diff --git a/.gitignore b/.gitignore
index 71bf9ab..0e8fc5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ noarch/
 .build*.log
 *.src.rpm
 /ipxe-*.tar.xz
+/patches.*
+*.orig
diff --git a/ipxe.spec b/ipxe.spec
index 8a74dc0..de32d95 100644
--- a/ipxe.spec
+++ b/ipxe.spec
@@ -19,7 +19,11 @@
 #   eepro100: 0x8086 0x1209
 #     e1000e: 0x8086 0x10d3
 #    vmxnet3: 0x15ad 0x07b0
+%if 0%{?rhel}
+%global qemuroms 8086100e 10ec8139 1af41000 808610d3
+%else
 %global qemuroms 10222000 10ec8029 8086100e 10ec8139 1af41000 80861209 808610d3 15ad07b0
+%endif
 
 # We only build the ROMs if on an x86 build host. The resulting
 # binary RPM will be noarch, so other archs will still be able
@@ -53,7 +57,7 @@
 
 Name:    ipxe
 Version: %{date}
-Release: 3.git%{hash}%{?dist}
+Release: 4.git%{hash}%{?dist}
 Summary: A network boot loader
 
 License: GPLv2 with additional permissions and BSD
@@ -66,6 +70,8 @@ Source0: %{name}-%{version}-git%{hash}.tar.xz
 Patch0001: 0001-build-customize-configuration.patch
 Patch0002: 0002-Use-spec-compliant-timeouts.patch
 
+# Source-git patches
+
 %ifarch %{buildarches}
 BuildRequires: perl-interpreter
 BuildRequires: perl-Getopt-Long
@@ -175,12 +181,15 @@ for rom in %{qemuroms}; do
   vid="0x${rom%%????}"
   did="0x${rom#????}"
   EfiRom -f "$vid" -i "$did" --pci23 \
-         -b  bin/${rom}.rom \
 %if 0%{?efi_ia32}
          -ec bin-i386-efi/${rom}.efidrv \
 %endif
          -ec bin-x86_64-efi/${rom}.efidrv \
-         -o  bin-combined/${rom}.rom
+         -o  bin-combined/${rom}.eficrom
+  util/catrom.pl \
+      bin/${rom}.rom \
+      bin-combined/${rom}.eficrom \
+      > bin-combined/${rom}.rom
   EfiRom -d  bin-combined/${rom}.rom
   # truncate to at least 256KiB
   truncate -s \>256K bin-combined/${rom}.rom
@@ -243,6 +252,14 @@ done
 %endif
 
 %changelog
+* Tue Jun 08 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20200823-4.git4bd064de
+- ipxe-Skip-some-QEMU-ROMs-when-building-for-RHEL.patch [bz#1956931]
+- ipxe-spec-combine-BIOS-and-EFI-roms-using-util-catrom.pl.patch [bz#1957246]
+- Resolves: bz#1956931
+  (ipxe-roms-qemu list: Clean out old ROMs)
+- Resolves: bz#1957246
+  (boot vm from pxe failed)
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 20200823-3.git4bd064de
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937