diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index 5f67de0be9..a259b69f3b 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -248,12 +248,6 @@ create_base_image() {
 
   # Setup hybrid MBR if it was enabled
   if [[ ${FLAGS_hybrid_mbr} -eq ${FLAGS_TRUE} ]]; then
-    info "Creating hybrid MBR"
-    sudo sfdisk "${BUILD_DIR}/${image_name}" <<EOF
-unit: sectors
-
-disk1 : start=   $START_ESP, size=    $NUM_ESP_SECTORS, Id= c, bootable
-disk2 : start=   1, size=    1, Id= ee
-EOF
+    install_hybrid_mbr "${BUILD_DIR}/${image_name}"
   fi
 }
diff --git a/image_to_usb.sh b/image_to_usb.sh
index e4a58a8835..715db4ea66 100755
--- a/image_to_usb.sh
+++ b/image_to_usb.sh
@@ -41,6 +41,8 @@ DEFINE_boolean factory_install ${FLAGS_FALSE} \
   "generate a factory install shim"
 DEFINE_boolean factory ${FLAGS_FALSE} \
   "generate a factory runing image, implies autotest and test"
+DEFINE_boolean hybrid_mbr ${FLAGS_FALSE} \
+  "Creates a hybrid MBR rather than a protective one"
 DEFINE_boolean copy_kernel ${FLAGS_FALSE} \
   "copy the kernel to the fourth partition"
 DEFINE_boolean test_image "${FLAGS_FALSE}" \
@@ -367,6 +369,11 @@ if [ -b "${FLAGS_to}" ]; then
       --arch="${FLAGS_arch}" \
       --payload_image="${SRC_IMAGE}" \
       --dst="${FLAGS_to}"
+
+    # Setup hybrid MBR if it was enabled
+    if [[ ${FLAGS_hybrid_mbr} -eq ${FLAGS_TRUE} ]]; then
+      install_hybrid_mbr "${FLAGS_to}"
+    fi
   fi
 elif [[ "${FLAGS_to}" == /dev/* ]]; then
   # Did the user attempt to write to a non-existent block device?