diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes
index 72a42ac..7b085a0 100644
--- a/qemu-testsuite.changes
+++ b/qemu-testsuite.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Oct  4 16:21:04 UTC 2017 - brogers@suse.com
+
+- Add dependencies on ovmf (uefi) for the qemu-x86 and qemu-arm
+  packages
+- Fix s390-netboot.img to be included with qemu-s390 package, not
+  qemu-ppc
+
 -------------------------------------------------------------------
 Tue Oct  3 21:07:26 UTC 2017 - brogers@suse.com
 
diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec
index 925d0fb..b90f1c8 100644
--- a/qemu-testsuite.spec
+++ b/qemu-testsuite.spec
@@ -493,6 +493,8 @@ Requires:       qemu-ipxe
 Requires:       qemu-seabios
 Requires:       qemu-sgabios
 Requires:       qemu-vgabios
+Recommends:     ovmf
+Recommends:     qemu-ovmf-x86_64
 
 %description x86
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -539,6 +541,8 @@ Group:          System/Emulators/PC
 Requires:       qemu = %version
 Recommends:     qemu-ipxe
 Recommends:     qemu-vgabios
+Recommends:     ovmf
+Recommends:     qemu-uefi-aarch64
 
 %description arm
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -1430,7 +1434,6 @@ fi
 %_datadir/%name/petalogix-ml605.dtb
 %_datadir/%name/skiboot.lid
 %_datadir/%name/qemu_vga.ndrv
-%_datadir/%name/s390-netboot.img
 %if 0%{?is_opensuse} == 0
 %dir %_docdir/qemu-ppc
 %_docdir/qemu-ppc/supported.txt
@@ -1440,6 +1443,7 @@ fi
 %defattr(-, root, root)
 %_bindir/qemu-system-s390x
 %_datadir/%name/s390-ccw.img
+%_datadir/%name/s390-netboot.img
 %if 0%{?is_opensuse} == 0
 %dir %_docdir/qemu-s390
 %_docdir/qemu-s390/supported.txt
diff --git a/qemu.changes b/qemu.changes
index 72a42ac..7b085a0 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Oct  4 16:21:04 UTC 2017 - brogers@suse.com
+
+- Add dependencies on ovmf (uefi) for the qemu-x86 and qemu-arm
+  packages
+- Fix s390-netboot.img to be included with qemu-s390 package, not
+  qemu-ppc
+
 -------------------------------------------------------------------
 Tue Oct  3 21:07:26 UTC 2017 - brogers@suse.com
 
diff --git a/qemu.spec b/qemu.spec
index a84f264..4bee14c 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -493,6 +493,8 @@ Requires:       qemu-ipxe
 Requires:       qemu-seabios
 Requires:       qemu-sgabios
 Requires:       qemu-vgabios
+Recommends:     ovmf
+Recommends:     qemu-ovmf-x86_64
 
 %description x86
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -539,6 +541,8 @@ Group:          System/Emulators/PC
 Requires:       qemu = %version
 Recommends:     qemu-ipxe
 Recommends:     qemu-vgabios
+Recommends:     ovmf
+Recommends:     qemu-uefi-aarch64
 
 %description arm
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -1430,7 +1434,6 @@ fi
 %_datadir/%name/petalogix-ml605.dtb
 %_datadir/%name/skiboot.lid
 %_datadir/%name/qemu_vga.ndrv
-%_datadir/%name/s390-netboot.img
 %if 0%{?is_opensuse} == 0
 %dir %_docdir/qemu-ppc
 %_docdir/qemu-ppc/supported.txt
@@ -1440,6 +1443,7 @@ fi
 %defattr(-, root, root)
 %_bindir/qemu-system-s390x
 %_datadir/%name/s390-ccw.img
+%_datadir/%name/s390-netboot.img
 %if 0%{?is_opensuse} == 0
 %dir %_docdir/qemu-s390
 %_docdir/qemu-s390/supported.txt
diff --git a/qemu.spec.in b/qemu.spec.in
index 52d6195..76c9ad7 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -455,6 +455,8 @@ Requires:       qemu-ipxe
 Requires:       qemu-seabios
 Requires:       qemu-sgabios
 Requires:       qemu-vgabios
+Recommends:     ovmf
+Recommends:     qemu-ovmf-x86_64
 
 %description x86
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -501,6 +503,8 @@ Group:          System/Emulators/PC
 Requires:       qemu = %version
 Recommends:     qemu-ipxe
 Recommends:     qemu-vgabios
+Recommends:     ovmf
+Recommends:     qemu-uefi-aarch64
 
 %description arm
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -1354,7 +1358,6 @@ fi
 %_datadir/%name/petalogix-ml605.dtb
 %_datadir/%name/skiboot.lid
 %_datadir/%name/qemu_vga.ndrv
-%_datadir/%name/s390-netboot.img
 %if 0%{?is_opensuse} == 0
 %dir %_docdir/qemu-ppc
 %_docdir/qemu-ppc/supported.txt
@@ -1364,6 +1367,7 @@ fi
 %defattr(-, root, root)
 %_bindir/qemu-system-s390x
 %_datadir/%name/s390-ccw.img
+%_datadir/%name/s390-netboot.img
 %if 0%{?is_opensuse} == 0
 %dir %_docdir/qemu-s390
 %_docdir/qemu-s390/supported.txt