diff --git a/config/data/grub/bootorder_uboot b/config/data/grub/bootorder_uboot
new file mode 100644
index 0000000..80641a3
--- /dev/null
+++ b/config/data/grub/bootorder_uboot
@@ -0,0 +1 @@
+/rom@img/u-boot
diff --git a/include/rom.sh b/include/rom.sh
index a5cbcf3..2aa945f 100644
--- a/include/rom.sh
+++ b/include/rom.sh
@@ -152,7 +152,9 @@ add_seabios()
 
 	[ "$payload_grub" = "y" ] && add_grub
 
-	cprom && [ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; :
+	cprom
+	[ "$payload_uboot_amd64" = "y" ] && pname="seauboot" && cprom "seauboot"
+	[ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; :
 }
 
 add_grub()
@@ -208,11 +210,14 @@ add_uboot()
 cprom()
 {
 	newrom="bin/$target/${pname}_${target}_$initmode$displaymode.rom"
-	[ $# -gt 0 ] && newrom="${newrom%.rom}_${1%.gkb}.rom"
+	[ $# -gt 0 ] && [ "$1" != "seauboot" ] && \
+	    newrom="${newrom%.rom}_${1%.gkb}.rom"
 
 	x_ mkdir -p "bin/$target"
-	x_ cp "$tmprom" "$newrom" && [ $# -gt 0 ] && \
-	    cbfs "$newrom" "config/data/grub/keymap/$1" keymap.gkb raw; :
+	x_ cp "$tmprom" "$newrom" && [ $# -gt 0 ] && [ "$1" != "seauboot" ] && \
+	    cbfs "$newrom" "config/data/grub/keymap/$1" keymap.gkb raw
+	[ $# -gt 0 ] && [ "$1" = "seauboot" ] && \
+	    cbfs "$newrom" "config/data/grub/bootorder_uboot" "bootorder" raw; :
 }
 
 mkcoreboottar()