diff --git a/bin/cros_make_image_bootable b/bin/cros_make_image_bootable
index 673dac9033..cc9f79a243 100755
--- a/bin/cros_make_image_bootable
+++ b/bin/cros_make_image_bootable
@@ -77,7 +77,7 @@ DEFINE_string output_dir "/tmp" \
 DEFINE_string image "chromiumos_base.img" \
   "Full path to the chromiumos image to make bootable."
 DEFINE_string arch "x86" \
-  "Architecture to make bootable for: arm or x86"
+  "Architecture to make bootable for: arm, x86, or amd64"
 DEFINE_string usb_disk "/dev/sdb3" \
   "Path syslinux should use to do a usb boot."
 DEFINE_boolean cleanup_dirs ${FLAGS_TRUE} \
@@ -273,7 +273,7 @@ make_image_bootable() {
   esp_size=$((esp_size * 512))  # sectors to bytes
   local bootloader_to_flags="--to_offset=${esp_offset} --to_size=${esp_size}"
 
-  if [[ "${FLAGS_arch}" = "x86" ]]; then
+  if [ "${FLAGS_arch}" = "x86" -o "${FLAGS_arch}" = "amd64" ]; then
     # Use the kernel partition to acquire configuration flags.
     kernel_part="--kernel_partition='${FLAGS_output_dir}/vmlinuz.image'"
     # Install syslinux on the EFI System Partition.
diff --git a/update_bootloaders.sh b/update_bootloaders.sh
index 7523cbaab4..39a077fee9 100755
--- a/update_bootloaders.sh
+++ b/update_bootloaders.sh
@@ -189,7 +189,7 @@ cleanup() {
 trap cleanup EXIT
 sudo mount "${ESP_DEV}" "${ESP_FS_DIR}"
 
-if [[ "${FLAGS_arch}" = "x86" ]]; then
+if [ "${FLAGS_arch}" = "x86" -o "${FLAGS_arch}" = "amd64" ]; then
   # Populate the EFI bootloader configuration
   sudo mkdir -p "${ESP_FS_DIR}/efi/boot"
   sudo cp "${FLAGS_from}"/efi/boot/bootx64.efi \