diff --git a/tool/boot/README b/tool/boot/README
index 809465ac2..cca237b7d 100644
--- a/tool/boot/README
+++ b/tool/boot/README
@@ -29,18 +29,3 @@ code respectively the download source of binaries are described below.
   OS header can be loaded.
   The changes are available on the genode_bender branch of
   https://github.com/skalk/morbo.git.
-
-:'tianocore.bin'
-
-  Open Virtual Machine Firmware (OVMF) developed by
-  http://www.tianocore.org/ovmf. OVMF is an project to enable UEFI support for
-  Virtual Machines. This UEFI binary is supposed to be used with QEMU.
-
-  The UEFI firmware was built based on the description of
-
-  https://github.com/tianocore/tianocore.github.io/wiki/How-to-build-OVMF
-
-  and the source code has been obtained from
-
-  https://github.com/tianocore/edk2.git
-  git commit 6e5e544f227f031d0b45828b56cec5668dd1bf5b
diff --git a/tool/boot/tianocore.bin b/tool/boot/tianocore.bin
deleted file mode 100644
index e7fc2f52d..000000000
Binary files a/tool/boot/tianocore.bin and /dev/null differ
diff --git a/tool/run/power_on/qemu b/tool/run/power_on/qemu
index f6c980dff..f664e4f91 100644
--- a/tool/run/power_on/qemu
+++ b/tool/run/power_on/qemu
@@ -140,7 +140,12 @@ proc run_power_on { } {
 			append qemu_args " -drive format=raw,file=[run_dir].img "
 		} else {
 		if {[have_include "image/uefi"]} {
-			append qemu_args " --bios [genode_dir]/tool/boot/tianocore.bin -net none -drive format=raw,file=[run_dir].img "
+			set uefi_firmware "/usr/share/ovmf/OVMF.fd"
+			if {![file exists $uefi_firmware]} {
+				puts "'$uefi_firmware' uefi image missing. Please install a ovmf package matching your qemu version."
+				exit -3
+			}
+			append qemu_args " --bios $uefi_firmware -net none -drive format=raw,file=[run_dir].img "
 		} else {
 			puts "Aborting, cannot execute Qemu without a ISO or disk image"
 			exit -4