diff --git a/tool/boot/README b/tool/boot/README
index fe9fa184f..65e5d9d6b 100644
--- a/tool/boot/README
+++ b/tool/boot/README
@@ -45,3 +45,18 @@ code respectively the download source of binaries are described below.
   commit 972765fe8245cdf44d465329f33b5aa9ac6c2f47.
 
   The following modules were included: part_msdos iso9660 part_gpt ext2 multiboot multiboot2 fat normal configfile setpci serial efi_uga efi_gop
+
+:'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
new file mode 100644
index 000000000..e7fc2f52d
Binary files /dev/null and b/tool/boot/tianocore.bin differ
diff --git a/tool/run/power_on/qemu b/tool/run/power_on/qemu
index 0a637e046..b939a9087 100644
--- a/tool/run/power_on/qemu
+++ b/tool/run/power_on/qemu
@@ -78,17 +78,18 @@ proc run_power_on { } {
 		if {[have_include "load/tftp"]} {
 			append qemu_args " -boot n -tftp [run_dir] -bootp boot/pulsar -no-reboot -no-shutdown "
 		} else {
-			if {[have_include "image/iso"]} {
-				append qemu_args " -cdrom [run_dir].iso "
-			} else {
-				if {[have_include "image/disk"]} {
-					append qemu_args " -hda [run_dir].img "
-				} else {
-					puts "Aborting, cannot execute Qemu without a ISO or disk image"
-					exit -4
-				}
-			}
-		}
+		if {[have_include "image/iso"]} {
+			append qemu_args " -cdrom [run_dir].iso "
+		} else {
+		if {[have_include "image/disk"]} {
+			append qemu_args " -hda [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 "
+		} else {
+			puts "Aborting, cannot execute Qemu without a ISO or disk image"
+			exit -4
+		} } } }
 	}
 
 	# on ARM, we supply the boot image as kernel