diff --git a/envsetup.sh b/envsetup.sh
index 26db504..65849d9 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -136,7 +136,7 @@
             ;;
         mips) toolchaindir=mips/mipsel-linux-android-$targetgccversion/bin
             ;;
-        mips64) toolchaindir=mips/mipsel-linux-android-$targetgccversion/bin
+        mips64) toolchaindir=mips/mips64el-linux-android-$targetgccversion/bin
             ;;
         *)
             echo "Can't find toolchain for unknown architecture: $ARCH"
@@ -437,6 +437,7 @@
 add_lunch_combo aosp_arm-eng
 add_lunch_combo aosp_arm64-eng
 add_lunch_combo aosp_mips-eng
+add_lunch_combo aosp_mips64-eng
 add_lunch_combo aosp_x86-eng
 add_lunch_combo aosp_x86_64-eng
 add_lunch_combo vbox_x86-eng