diff --git a/tool/run/boot_dir/fiasco b/tool/run/boot_dir/fiasco
index 52ed15d15..87bd541ca 100644
--- a/tool/run/boot_dir/fiasco
+++ b/tool/run/boot_dir/fiasco
@@ -144,4 +144,10 @@ proc run_boot_dir {binaries} {
 
 		generate_tftp_config
 	}
+
+	if {[have_include "load/ipxe"]} {
+		create_ipxe_iso_config
+		update_ipxe_boot_dir
+		create_symlink_for_iso
+	}
 }
diff --git a/tool/run/boot_dir/foc b/tool/run/boot_dir/foc
index bc3a70ec1..14d009e75 100644
--- a/tool/run/boot_dir/foc
+++ b/tool/run/boot_dir/foc
@@ -183,6 +183,12 @@ proc run_boot_dir_x86 {binaries} {
 
 		generate_tftp_config
 	}
+
+	if {[have_include "load/ipxe"]} {
+		create_ipxe_iso_config
+		update_ipxe_boot_dir
+		create_symlink_for_iso
+	}
 }
 
 
diff --git a/tool/run/boot_dir/nova b/tool/run/boot_dir/nova
index 5fd3871ee..60d852945 100644
--- a/tool/run/boot_dir/nova
+++ b/tool/run/boot_dir/nova
@@ -93,4 +93,10 @@ proc run_boot_dir {binaries} {
 
 		generate_tftp_config
 	}
+
+	if {[have_include "load/ipxe"]} {
+		create_ipxe_iso_config
+		update_ipxe_boot_dir
+		create_symlink_for_iso
+	}
 }
diff --git a/tool/run/load/ipxe b/tool/run/load/ipxe
index 40c0e6fb4..d673ac70f 100644
--- a/tool/run/load/ipxe
+++ b/tool/run/load/ipxe
@@ -46,3 +46,23 @@ proc create_symlink_for_iso { } {
 proc update_ipxe_boot_dir { } {
 	exec ln -sfn [pwd]/[run_dir] [load_ipxe_base_dir]/[load_ipxe_boot_dir]
 }
+
+##
+# Create iPXE config file which directly boots an ISO file.
+#
+proc create_ipxe_iso_config { } {
+	if {[have_include "image/iso"]} {
+		set fh [open "[run_dir]/boot.cfg" "WRONLY CREAT TRUNC"]
+		puts $fh "#!ipxe"
+		puts $fh "sanboot [run_name].iso || goto failed"
+		puts $fh
+		puts $fh ":failed"
+		puts $fh "echo Booting failed, dropping to shell"
+		puts $fh "shell"
+		puts $fh "boot"
+		close $fh
+	} else {
+		puts "Warning, iPXE requires ISO image."
+		exit -1
+	}
+}