diff --git a/meta-luv/recipes-core/images/luv-live-image.bb b/meta-luv/recipes-core/images/luv-live-image.bb
index 355f73fe9a9..c10c0e6788e 100644
--- a/meta-luv/recipes-core/images/luv-live-image.bb
+++ b/meta-luv/recipes-core/images/luv-live-image.bb
@@ -59,9 +59,20 @@ build_img() {
 
     parted $IMG set 2 boot on
 
+    # Mark the second partition OSType field as EFI System Partition as
+    # specified in the UEFI specification.
+    fdisk $IMG<<EOF
+t
+2
+ef
+w
+EOF
+
     dd conv=notrunc if=${VFAT_RESULTS} of=$IMG seek=1 bs=512
     dd if=${VFAT} of=$IMG seek=$(expr $(expr $VFAT_RESULTS_SIZE / 512) + 1) bs=512
 
+    dd conv=notrunc if=${VFAT} of=$IMG seek=1 bs=512
+
 }
 
 python do_create_img() {