diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile
index 439540ce..4256e861 100644
--- a/java/openjdk17/Makefile
+++ b/java/openjdk17/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VERSION}
 
-ONLY_FOR_ARCHS=	amd64 i386 powerpc64
+ONLY_FOR_ARCHS=	amd64 i386 powerpc64 aarch64
 
 BUILD_DEPENDS+=	unzip:arch/unzip
 BUILD_DEPENDS+=	zip:arch/zip
@@ -66,8 +66,8 @@ NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	17
 JDK_MINOR_VERSION=	0
-JDK_PATCH_VERSION=	3
-JDK_BUILD_NUMBER=	7
+JDK_PATCH_VERSION=	4
+JDK_BUILD_NUMBER=	8
 BSD_JDK_VERSION=	1
 
 
@@ -182,7 +182,7 @@ SUB_LIST+= PREFIX=${PREFIX}
 SUB_LIST+= PORTNAME=${PORTNAME}${PKGNAMESUFFIX}
 SUB_FILES+= man.conf
 
-PLIST=	${PKGDIR}/pkg-plist.${ARCH}
+#PLIST=	${PKGDIR}/pkg-plist.${ARCH}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${INSTALLDIR}
diff --git a/java/openjdk17/distinfo b/java/openjdk17/distinfo
index 9c7f4d5d..07cb2ee1 100644
--- a/java/openjdk17/distinfo
+++ b/java/openjdk17/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653634414
-SHA256 (battleblow-jdk17u-jdk-17.0.3+7-1_GH0.tar.gz) = cffe416d32c273050f47dff7a22bf3626bc09a7684de74edd5ddc6adf1021ee8
-SIZE (battleblow-jdk17u-jdk-17.0.3+7-1_GH0.tar.gz) = 104898973
+TIMESTAMP = 1664233261
+SHA256 (battleblow-jdk17u-jdk-17.0.4+8-1_GH0.tar.gz) = 3de3785971cd7764952f0f8f51055efd22fc295ad3b7640a1e83f64487612475
+SIZE (battleblow-jdk17u-jdk-17.0.4+8-1_GH0.tar.gz) = 105007565
diff --git a/java/openjdk17/pkg-deinstall b/java/openjdk17/pkg-deinstall
index dea0ee38..a6b3f0d3 100644
--- a/java/openjdk17/pkg-deinstall
+++ b/java/openjdk17/pkg-deinstall
@@ -10,7 +10,7 @@ case $2 in
     DEINSTALL)
 	;;
     POST-DEINSTALL)
-	${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk14/bin/java
+	${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk17/bin/java
 	;;
 esac
 #EOF
diff --git a/java/openjdk17/pkg-install b/java/openjdk17/pkg-install
index 3fea1d3a..2a9e81ce 100644
--- a/java/openjdk17/pkg-install
+++ b/java/openjdk17/pkg-install
@@ -9,7 +9,7 @@ case $2 in
     PRE-INSTALL)
 	;;
     POST-INSTALL)
-	${LOCALBASE}/bin/registervm ${PREFIX}/openjdk14/bin/java
+	${LOCALBASE}/bin/registervm ${PREFIX}/openjdk17/bin/java
 	;;
 esac
 #EOF
diff --git a/java/openjdk17/pkg-plist.amd64 b/java/openjdk17/pkg-plist
similarity index 100%
rename from java/openjdk17/pkg-plist.amd64
rename to java/openjdk17/pkg-plist