diff --git a/build_image b/build_image
index 581186edc3..2779fc064d 100755
--- a/build_image
+++ b/build_image
@@ -64,8 +64,8 @@ show_help_if_requested "$@"
 # not needed for the typical developer workflow.
 DEFINE_integer build_attempt 1 \
   "The build attempt for this image build."
-DEFINE_string version "" \
-  "Overrides version number in name to this version."
+DEFINE_boolean hybrid_mbr ${FLAGS_FALSE} \
+  "Creates a hybrid MBR rather than a protective one"
 DEFINE_integer jobs -1 \
   "How many packages to build in parallel at maximum."
 DEFINE_boolean replace ${FLAGS_FALSE} \
@@ -81,6 +81,8 @@ DEFINE_string verity_algorithm "sha1" \
   "Cryptographic hash algorithm used for kernel vboot. Default : sha1"
 DEFINE_string verity_salt "" \
   "Root filesystem salt. Default: randomly generated."
+DEFINE_string version "" \
+  "Overrides version number in name to this version."
 
 # Parse command line.
 FLAGS "$@" || exit 1
diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index 7286ecf5ae..582a9875a0 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -245,4 +245,15 @@ create_base_image() {
                                                 ${image_name} \
                                                 ${USE_DEV_KEYS}
   fi
+
+  # Setup hybrid MBR if it was enabled
+  if [[ ${FLAGS_hybrid_mbr_hack} -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
+  fi
 }