diff --git a/java/bootstrap-openjdk11/Makefile b/java/bootstrap-openjdk11/Makefile
--- a/java/bootstrap-openjdk11/Makefile
+++ b/java/bootstrap-openjdk11/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	openjdk11
 PORTVERSION=	11.0.5.10.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	LOCAL/glewis/bootstrap-openjdk11 \
 		LOCAL/pkubaj
@@ -27,6 +28,8 @@
 
 INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
 
+BUNDLE_LIBS=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH:Marmv*}
diff --git a/java/bootstrap-openjdk17/Makefile b/java/bootstrap-openjdk17/Makefile
--- a/java/bootstrap-openjdk17/Makefile
+++ b/java/bootstrap-openjdk17/Makefile
@@ -1,6 +1,6 @@
 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
@@ -27,6 +27,8 @@
 
 INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
 
+BUNDLE_LIBS=	yes
+
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500000
diff --git a/java/bootstrap-openjdk8/Makefile b/java/bootstrap-openjdk8/Makefile
--- a/java/bootstrap-openjdk8/Makefile
+++ b/java/bootstrap-openjdk8/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openjdk8
 PORTVERSION=	${DISTVERSION_${JDK_ARCH}}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	LOCAL/jkim \
 		LOCAL/mikael \
@@ -36,6 +36,8 @@
 
 INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
 
+BUNDLE_LIBS=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH:Marmv*}