diff --git a/ipxe.spec b/ipxe.spec
index 8b48896..22b24cf 100644
--- a/ipxe.spec
+++ b/ipxe.spec
@@ -1,5 +1,6 @@
 %if 0%{?fedora}
 %global cross 1
+%global efi_ia32 1
 %endif
 
 # Resulting binary formats we want from iPXE
@@ -49,7 +50,7 @@
 
 Name:    ipxe
 Version: %{date}
-Release: 1.git%{hash}%{?dist}
+Release: 2.git%{hash}%{?dist}
 Summary: A network boot loader
 
 License: GPLv2 with additional permissions and BSD
@@ -159,16 +160,24 @@ make_ipxe ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin \
 mkdir bin-combined
 for rom in %{qemuroms}; do
   make_ipxe CONFIG=qemu bin/${rom}.rom
+%if 0%{?efi_ia32}
   make_ipxe CONFIG=qemu bin-i386-efi/${rom}.efidrv
+%endif
   make_ipxe CONFIG=qemu bin-x86_64-efi/${rom}.efidrv
   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
   EfiRom -d  bin-combined/${rom}.rom
+  # truncate to at least 256KiB
+  truncate -s \>256K bin-combined/${rom}.rom
+  # verify rom fits in 256KiB
+  test $(stat -c '%s' bin-combined/${rom}.rom) -le $((256 * 1024))
 done
 
 %endif
@@ -231,6 +240,10 @@ done
 %endif
 
 %changelog
+* Tue Jul 16 2019 Paolo Bonzini <pbonxini@redhat.com> - 20190125-2.git36a4c85f
+- Allow removing IA32 EFI images from combined oproms
+- Check that the ROMs fit in 256K and pad them
+
 * Tue Feb 12 2019 Daniel P. Berrangé <berrange@redhat.com> - 20190125-1.git36a4c85f
 - Update to latest git snapshot