diff --git a/build_gpt.sh b/build_gpt.sh
index 4be100c0f1..eed4df1df7 100755
--- a/build_gpt.sh
+++ b/build_gpt.sh
@@ -86,6 +86,9 @@ else
     *86)
       ARCH="x86"
       ;;
+    *x86_64)
+      ARCH="amd64"
+      ;;
     *)
       error "Unable to determine ARCH from toolchain: $CHOST"
       exit 1
diff --git a/build_image b/build_image
index 9faf25d109..17454945b5 100755
--- a/build_image
+++ b/build_image
@@ -200,6 +200,9 @@ case "${TC_ARCH}" in
   *86)
     ARCH="x86"
     ;;
+  *x86_64)
+    ARCH="amd64"
+    ;;
   *)
     error "Unable to determine ARCH from toolchain: ${CHOST}"
     exit 1
diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh
index 1f05010dd5..b08695ce76 100755
--- a/mod_image_for_recovery.sh
+++ b/mod_image_for_recovery.sh
@@ -138,6 +138,9 @@ case "${TC_ARCH}" in
   *86)
     ARCH="x86"
     ;;
+  *x86_64)
+    ARCH="amd64"
+    ;;
   *)
     error "Unable to determine ARCH from toolchain: ${CHOST}"
     exit 1
diff --git a/mod_image_for_test.sh b/mod_image_for_test.sh
index 9a3c44c3b0..954b6580b4 100755
--- a/mod_image_for_test.sh
+++ b/mod_image_for_test.sh
@@ -97,6 +97,9 @@ case "$TC_ARCH" in
   *86)
     ARCH="x86"
     ;;
+  *x86_64)
+    ARCH="amd64"
+    ;;
   *)
     error "Unable to determine ARCH from toolchain: $CHOST"
     exit 1