diff --git a/build_image b/build_image
index 3a26baacc0..f51b1826af 100755
--- a/build_image
+++ b/build_image
@@ -651,6 +651,10 @@ create_base_image() {
     "${OUTPUT_DIR}" \
     "${OUTPUT_DIR}/${image_name}"
 
+  # Pre-set "sucessful" bit in gpt, so we will never mark-for-death
+  # a partition on an SDCard/USB stick.
+  ${GPT} add -i 2 -S 1 "${OUTPUT_DIR}/${image_name}"
+
   trap - EXIT
 }