diff --git a/java/openjdk25/Makefile b/java/openjdk25/Makefile
--- a/java/openjdk25/Makefile
+++ b/java/openjdk25/Makefile
@@ -18,7 +18,7 @@
 		gsed:textproc/gsed \
 		zip:archivers/zip
 
-.if ${FLAVORS:U} != headless
+.if ${FLAVORS:U} != headless && ${FLAVORS:U} != jre_headless
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
@@ -29,18 +29,25 @@
 .endif
 
 RUN_DEPENDS=	javavm:java/javavmwrapper
-.if ${FLAVORS:U} != headless
+.if ${FLAVORS:U} != headless && ${FLAVORS:U} != jre_headless
 RUN_DEPENDS+=	xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 .endif
 
-FLAVORS=	jdk jre headless
+# This port supports the following flavors:
+#
+# - jdk (default)	Full OpenJDK including dev tools and x11 support
+# - headless		Full OpenJDK including dev tools, but without x11 support
+# - jre			Java Runtime Environment including x11 support
+# - jre_headless	Jave Runtime Environment without x11 support
+FLAVORS=	jdk jre headless jre_headless
 FLAVOR?=	${BUILD_JRE:?jre:${FLAVORS:[1]}}
 
 headless_PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-headless
 jre_PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-jre
+jre_headless_PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-jre-headless
 
 USES=		autoreconf:build compiler:features cpe gmake iconv pkgconfig
-.if ${FLAVORS:U} != headless
+.if ${FLAVORS:U} != headless && ${FLAVORS:U} != jre_headless
 USES+=		jpeg xorg
 .endif
 
@@ -49,7 +56,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 
-.if ${FLAVORS:U} != headless
+.if ${FLAVORS:U} != headless && ${FLAVORS:U} != jre_headless
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 .endif
 
@@ -82,7 +89,7 @@
 CONFIGURE_ENV=		ac_cv_path_SED=${LOCALBASE}/bin/gsed
 CONFIGURE_TARGET=	${JDK_ARCH}-portbld-${OPSYS:tl}${OSREL}
 
-.if ${FLAVOR:U} == headless
+.if ${FLAVORS:U} != headless && ${FLAVORS:U} != jre_headless
 CONFIGURE_ARGS+=	--enable-headless-only
 .endif
 
@@ -95,7 +102,7 @@
 		LOG=cmdlines \
 		MAKEFLAGS=""
 
-.if ${FLAVOR:U} == jre
+.if ${FLAVOR:U} == jre || ${FLAVOR:U} == jre_headless
 ALL_TARGET=	legacy-images
 .else
 ALL_TARGET=	images
@@ -105,7 +112,7 @@
 JDK_ARCH=	${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
 JDK_OSARCH=	bsd-${JDK_ARCH}
 JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
-.if ${FLAVOR:U} == jre
+.if ${FLAVOR:U} == jre || ${FLAVOR:U} == jre_headless
 BUILD_JRE=	true
 JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jre
 .else