diff --git a/clonejdk.sh b/clonejdk.sh
index 2c18ba8..787cd63 100755
--- a/clonejdk.sh
+++ b/clonejdk.sh
@@ -12,3 +12,5 @@ cd jdk
 hg import ../../termux-openjdk-aarch64-patches/jdk/*.patch --no-commit
 
 cd ..
+hg import ../termux-openjdk-aarch64-patches/*.patch --no-commit
+
diff --git a/termux-openjdk-aarch64-patches/aarch64-flags.patch b/termux-openjdk-aarch64-patches/aarch64-flags.patch
new file mode 100644
index 0000000..6ee6071
--- /dev/null
+++ b/termux-openjdk-aarch64-patches/aarch64-flags.patch
@@ -0,0 +1,18 @@
+--- ./common/autoconf/flags.m4
++++ ./common/autoconf/flags.m4
+@@ -153,10 +153,15 @@ AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS],
+       EXTRA_CFLAGS="$EXTRA_CFLAGS -mthumb -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE  -Wno-psabi -fPIE"
+       EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -mthumb -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -DFLOAT_ARCH=-vfp-sflt -fPIE"
+       EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,--unresolved-symbols=ignore-all -Wl,--gc-sections -fPIE"
++    elif test "x$OPENJDK_TARGET_CPU" = xarm64 || test "x$OPENJDK_TARGET_CPU" = xaarch64; then
++      EXTRA_CFLAGS="$EXTRA_CFLAGS -march=armv8-a -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE  -Wno-psabi -fPIE"
++      EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -march=armv8-a -fPIE"
++      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,--unresolved-symbols=ignore-all -Wl,--gc-sections -fPIE"
+     else
+       EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE -Wno-psabi -march=i686 -msse3 -mstackrealign -mfpmath=sse -fPIE"
+       EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,--unresolved-symbols=ignore-all -Wl,--gc-sections -Wl,-z,nocopyreloc -fPIE"
+     fi
++    # TODO x86_64 port
+   fi
+
+   # Hotspot needs these set in their legacy form