diff --git a/java/bootstrap-openjdk11/Makefile b/java/bootstrap-openjdk11/Makefile
index d3a00da8743a..b098e5311dd7 100644
--- a/java/bootstrap-openjdk11/Makefile
+++ b/java/bootstrap-openjdk11/Makefile
@@ -1,55 +1,58 @@
 PORTNAME=	openjdk11
 PORTVERSION=	11.0.5.10.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	LOCAL/glewis/bootstrap-openjdk11 \
 		LOCAL/pkubaj
 PKGNAMEPREFIX=	bootstrap-
 DISTNAME=	${JDK_PORT}-${JDK_ARCH}-${PORTVERSION}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit 11
 WWW=		https://openjdk.java.net/
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le
 
 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:C/armv.*/arm/}${JDK_ARCH_SUFFIX_${ARCH}}
 JDK_ARCH_SUFFIX_powerpc64=	-elfv2
 
 INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
 
+BUNDLE_LIBS=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH:Marmv*}
 DISTNAME=	${JDK_PORT}-${JDK_ARCH}-12-${PORTVERSION}
 PLIST_SUB+=	PPC=""
 PLIST_SUB+=	PPC64LE=""
 .elif ${ARCH} == powerpc64le
 PLIST_SUB+=	PPC=""
 PLIST_SUB+=	PPC64LE="@comment "
 .elif ${ARCH} == powerpc
 PLIST_SUB+=	PPC="@comment "
 PLIST_SUB+=	PPC64LE=""
 .else
 PLIST_SUB+=	PPC=""
 PLIST_SUB+=	PPC64LE=""
 .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.post.mk>
diff --git a/java/bootstrap-openjdk17/Makefile b/java/bootstrap-openjdk17/Makefile
index f5b98b039baa..786cd081637e 100644
--- a/java/bootstrap-openjdk17/Makefile
+++ b/java/bootstrap-openjdk17/Makefile
@@ -1,59 +1,61 @@
 PORTNAME=	openjdk17
 PORTVERSION=	17.0.1.12.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	LOCAL/glewis/bootstrap-openjdk17 \
 		LOCAL/pkubaj/bootstrap-openjdk17
 PKGNAMEPREFIX=	bootstrap-
 DISTNAME=	${JDK_PORT}-${JDK_ARCH}-${PORTVERSION}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit 17
 WWW=		https://openjdk.java.net/
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc powerpc64 powerpc64le
 
 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:C/armv.*/arm/}
 
 INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
 
+BUNDLE_LIBS=	yes
+
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500000
 RUN_DEPENDS+=	compat14x-${ARCH}>=0:misc/compat14x
 .endif
 
 .if ${ARCH} == powerpc
 PLIST_SUB+=	NOT_PPC="@comment "
 .else
 PLIST_SUB+=	NOT_PPC=""
 .endif
 
 .if ${ARCH:Mpowerpc64*}
 PLIST_SUB+=	NOT_PPC64="@comment "
 .else
 PLIST_SUB+=	NOT_PPC64=""
 .endif
 
 .if ${ARCH} == i386
 PLIST_SUB+=	NOT_I386="@comment "
 .else
 PLIST_SUB+=	NOT_I386=""
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
 	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${INSTALLDIR}
 	@${CHMOD} a+x ${INSTALLDIR}/lib/jspawnhelper
 
 .include <bsd.port.mk>
diff --git a/java/bootstrap-openjdk8/Makefile b/java/bootstrap-openjdk8/Makefile
index f1fb9aaaa16d..380a70f267db 100644
--- a/java/bootstrap-openjdk8/Makefile
+++ b/java/bootstrap-openjdk8/Makefile
@@ -1,53 +1,55 @@
 PORTNAME=	openjdk8
 PORTVERSION=	${DISTVERSION_${JDK_ARCH}}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	LOCAL/jkim \
 		LOCAL/mikael \
 		LOCAL/pkubaj
 PKGNAMEPREFIX=	bootstrap-
 DISTNAME=	${JDK_PORT}-${JDK_ARCH}-${PORTVERSION}
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Java Development Kit 8
 WWW=		https://openjdk.java.net/
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le
 
 DISTINFO_FILE=	${.CURDIR}/distinfo.${JDK_ARCH}
 DISTVERSION_aarch64=	r453316
 DISTVERSION_amd64=	r450802
 DISTVERSION_arm=	r450802
 DISTVERSION_i386=	r450802
 DISTVERSION_ppc=	8bfca5a163f4527b2097a7cb56e2410418c9f233
 DISTVERSION_ppc64=	r522831
 DISTVERSION_ppc64le=	r555661
 
 JDK_ARCH=	${ARCH:C/armv.*/arm/:S/powerpc/ppc/}
 JDK_PORT=	openjdk8
 JDK_ROOT=	bootstrap-${PORTNAME}
 
 NO_BUILD=	yes
 PLIST_SUB=	JDK_ARCH=${JDK_ARCH} JDK_ROOT=${JDK_ROOT}
 USES=		tar:xz
 WRKSRC=		${WRKDIR}/${JDK_ROOT}
 
 INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
 
+BUNDLE_LIBS=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH:Marmv*}
 RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libffi.so.6:devel/libffi321
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
 	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${INSTALLDIR}
 
 update:
 	@${MAKE} -f ${.CURDIR}/Makefile.update \
 	    JDK_PORT=${JDK_PORT} JDK_ROOT=${JDK_ROOT}
 
 .include <bsd.port.post.mk>