diff --git a/java/bootstrap-openjdk8/Makefile b/java/bootstrap-openjdk8/Makefile
index 32956937406b..4def6f96bca4 100644
--- a/java/bootstrap-openjdk8/Makefile
+++ b/java/bootstrap-openjdk8/Makefile
@@ -1,8 +1,9 @@
 PORTNAME=	openjdk8
 PORTVERSION=	${DISTVERSION_${JDK_ARCH}}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	LOCAL/jkim \
+		LOCAL/mikael \
 		LOCAL/pkubaj
 PKGNAMEPREFIX=	bootstrap-
 DISTNAME=	${JDK_PORT}-${JDK_ARCH}-${PORTVERSION}
@@ -15,7 +16,7 @@ LICENSE=	GPLv2
 ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 DISTINFO_FILE=	${.CURDIR}/distinfo.${JDK_ARCH}
-DISTVERSION_aarch64=	r453315
+DISTVERSION_aarch64=	r453316
 DISTVERSION_amd64=	r450802
 DISTVERSION_arm=	r450802
 DISTVERSION_i386=	r450802
diff --git a/java/bootstrap-openjdk8/distinfo.aarch64 b/java/bootstrap-openjdk8/distinfo.aarch64
index 795d987bd220..2781e19bcf88 100644
--- a/java/bootstrap-openjdk8/distinfo.aarch64
+++ b/java/bootstrap-openjdk8/distinfo.aarch64
@@ -1,3 +1,3 @@
 TIMESTAMP = 1509600152
-SHA256 (openjdk8-aarch64-r453315.tar.xz) = 10a7b12c4898bf2d4010c4443d8f302cadcd09225fbe4bb5a69070f224e117f0
-SIZE (openjdk8-aarch64-r453315.tar.xz) = 27089824
+SHA256 (openjdk8-aarch64-r453316.tar.xz) = ddd240be029b6d0a32313f685b3320a73e954e63e9f7f47dd88f7a1fd2139bbe
+SIZE (openjdk8-aarch64-r453316.tar.xz) = 81689088
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index b43b73cdcba5..ae8ec10c977f 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -191,7 +191,7 @@ CONFIGURE_ARGS+=	--disable-jfr
 MAKE_ENV+=	LFLAGS="-Wl,-z,notext"
 .endif
 
-.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH:Mpowerpc64*}
+.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH:Mpowerpc64*}
 JDK_BUILD_JVM=	server
 .else
 JDK_BUILD_JVM=	zero