diff --git a/buildjdk.sh b/buildjdk.sh
index fead3ad..2819336 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 . setdevkitpath.sh
-export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-arm
+export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-aarch64
 export CUPS_DIR=`pwd`/cups-2.2.4
 
 # My system's JDK is too old (7.0), so we add an Oracle boot JDK.
@@ -16,8 +16,8 @@ rm -rf build
 bash ./configure \
 	--enable-option-checking=fatal \
 	--build=x86_64-unknown-linux-gnu \
-	--host=arm-linux-androideabi \
-	--target=arm-linux-androideabi \
+	--host=aarch64-linux-android \
+	--target=aarch64-linux-android \
 	--disable-warnings-as-errors \
 	--enable-headless-only \
 	--with-jdk-variant=normal \
@@ -27,5 +27,5 @@ bash ./configure \
 	--with-freetype-lib=$FREETYPE_DIR/lib \
 	--with-freetype-include=$FREETYPE_DIR/include/freetype2
 
-cd build/android-arm-normal-server-release
+cd build/android-aarch64-normal-server-release
 make JOBS=4 images
diff --git a/buildlibs.sh b/buildlibs.sh
index d0c0df5..26f4479 100755
--- a/buildlibs.sh
+++ b/buildlibs.sh
@@ -7,8 +7,8 @@ echo "Building Freetype"
 
 cd freetype-2.6.2
 ./configure \
-	--host=arm-linux-androideabi \
-	--prefix=`pwd`/build_android-arm \
+	--host=aarch64-linux-android \
+	--prefix=`pwd`/build_android-aarch64 \
 	--without-zlib \
 	--with-png=no \
 	--with-harfbuzz=no
diff --git a/devkit.info.arm b/devkit.info.arm
deleted file mode 100644
index 17eb535..0000000
--- a/devkit.info.arm
+++ /dev/null
@@ -1,3 +0,0 @@
-DEVKIT_NAME="Android ARM"
-DEVKIT_TOOLCHAIN_PATH="$DEVKIT_ROOT/arm-linux-androideabi/bin"
-DEVKIT_SYSROOT="$DEVKIT_ROOT/sysroot"
diff --git a/devkit.info.arm64 b/devkit.info.arm64
new file mode 100644
index 0000000..8cf1c57
--- /dev/null
+++ b/devkit.info.arm64
@@ -0,0 +1,3 @@
+DEVKIT_NAME="Android ARM64"
+DEVKIT_TOOLCHAIN_PATH="$DEVKIT_ROOT/aarch64-linux-android/bin"
+DEVKIT_SYSROOT="$DEVKIT_ROOT/sysroot"
diff --git a/maketoolchain.sh b/maketoolchain.sh
index 15639f0..32e1a30 100755
--- a/maketoolchain.sh
+++ b/maketoolchain.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 android-ndk-r10e/build/tools/make-standalone-toolchain.sh \
-	--arch=arm \
+	--arch=arm64 \
 	--platform=android-21 \
-	--install-dir=`pwd`/android-ndk-r10e/generated-toolchains/android-arm-toolchain
-cp devkit.info.arm android-ndk-r10e/generated-toolchains/android-arm-toolchain/
+	--install-dir=`pwd`/android-ndk-r10e/generated-toolchains/android-arm64-toolchain
+cp devkit.info.arm64 android-ndk-r10e/generated-toolchains/android-arm-toolchain/