Index: head/java/bootstrap-openjdk11/Makefile
===================================================================
--- head/java/bootstrap-openjdk11/Makefile	(revision 510293)
+++ head/java/bootstrap-openjdk11/Makefile	(revision 510294)
@@ -1,38 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	openjdk11
 PORTVERSION=	11.0.2.9.2
 PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	LOCAL/glewis/bootstrap-openjdk11
 PKGNAMEPREFIX=	bootstrap-
 DISTNAME=	${JDK_PORT}-${JDK_ARCH}-${PORTVERSION}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit 11
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 
 USES=		tar:xz
 
 NO_BUILD=	yes
 PLIST_SUB=	JDK_ROOT=${JDK_ROOT}
 WRKSRC=		${WRKDIR}/${JDK_ROOT}
 
 JDK_PORT=	${PKGNAMEPREFIX}${PORTNAME}
 JDK_ROOT=	${PKGNAMEPREFIX}${PORTNAME}
 JDK_ARCH=	${ARCH}
 
 INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
 
+.include <bsd.port.pre.mk>
+
+# Support aarch64 on FreeBSD 12 and up
+.if ${OSVERSION} >= 1200500
+ONLY_FOR_ARCHS+=aarch64
+.endif
+
+.if ${ARCH} == aarch64
+DISTNAME=	${JDK_PORT}-${JDK_ARCH}-12-${PORTVERSION}
+.endif
+
 post-extract:
 	-${MV} ${WRKSRC}/include/bsd ${WRKSRC}/include/freebsd
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
 	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${INSTALLDIR}
 	@${CHMOD} a+x ${INSTALLDIR}/lib/jspawnhelper
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/java/bootstrap-openjdk11/distinfo
===================================================================
--- head/java/bootstrap-openjdk11/distinfo	(revision 510293)
+++ head/java/bootstrap-openjdk11/distinfo	(revision 510294)
@@ -1,7 +1,9 @@
-TIMESTAMP = 1566697022
+TIMESTAMP = 1567191227
+SHA256 (bootstrap-openjdk11-aarch64-12-11.0.2.9.2.tar.xz) = 03b15627aeda4ca1e2350c713323191728468110bf6c0f2eb233e08985d590c2
+SIZE (bootstrap-openjdk11-aarch64-12-11.0.2.9.2.tar.xz) = 99517364
 SHA256 (bootstrap-openjdk11-amd64-11.0.2.9.2.tar.xz) = e53f16a33fca82db960b68ea200b6146eaf8b3ec8b09f5fe1c7711d926d94ffa
 SIZE (bootstrap-openjdk11-amd64-11.0.2.9.2.tar.xz) = 102199460
 SHA256 (bootstrap-openjdk11-i386-11.0.2.9.2.tar.xz) = 68b84741d7b8a7241fb30614881f15db3c174d973f999d34e0f53aca6190e00f
 SIZE (bootstrap-openjdk11-i386-11.0.2.9.2.tar.xz) = 96936056
 SHA256 (bootstrap-openjdk11-powerpc64-11.0.2.9.2.tar.xz) = 4ac1cfc66da594d981dc8d953f818bd6a83f69567e562212f2507e342c583aac
 SIZE (bootstrap-openjdk11-powerpc64-11.0.2.9.2.tar.xz) = 102988560