diff --git a/java/Makefile b/java/Makefile
index cbdaaa9aa848..8bd76be6c979 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -1,106 +1,107 @@
     COMMENT = Java language support
 
     SUBDIR += apache-bcel
     SUBDIR += apache-commons-beanutils
     SUBDIR += apache-commons-cli
     SUBDIR += apache-commons-codec
     SUBDIR += apache-commons-collections
     SUBDIR += apache-commons-collections4
     SUBDIR += apache-commons-dbcp
     SUBDIR += apache-commons-httpclient
     SUBDIR += apache-commons-lang
     SUBDIR += apache-commons-lang3
     SUBDIR += apache-commons-logging
     SUBDIR += apache-commons-pool
     SUBDIR += aparapi
     SUBDIR += avis
     SUBDIR += berkeley-db
     SUBDIR += bluej
     SUBDIR += bootstrap-openjdk11
     SUBDIR += bootstrap-openjdk17
     SUBDIR += bootstrap-openjdk8
     SUBDIR += bouncycastle
     SUBDIR += dbvis
     SUBDIR += eclipse
     SUBDIR += eclipse-EPIC
     SUBDIR += eclipse-cdt
     SUBDIR += eclipse-drjava
     SUBDIR += eclipse-ecj
     SUBDIR += eclipse-findbugs
     SUBDIR += eclipse-pydev
     SUBDIR += eclipse-shelled
     SUBDIR += eclipse-yaml-editor
     SUBDIR += hamcrest
     SUBDIR += icedtea-web
     SUBDIR += intellij
     SUBDIR += intellij-fsnotifier
     SUBDIR += intellij-pty4j
     SUBDIR += intellij-ultimate
     SUBDIR += jad
     SUBDIR += jai
     SUBDIR += jakarta-oro
     SUBDIR += jasmin
     SUBDIR += jattach
     SUBDIR += java-cup
     SUBDIR += java-getopt
     SUBDIR += java-subversion
     SUBDIR += java-zoneinfo
     SUBDIR += java3d
     SUBDIR += javahelp
     SUBDIR += javamail
     SUBDIR += javavmwrapper
     SUBDIR += jcalendar
     SUBDIR += jcckit
     SUBDIR += jcommon
     SUBDIR += jd-gui
     SUBDIR += jdk11-doc
     SUBDIR += jdk8-doc
     SUBDIR += jflex
     SUBDIR += jfreechart
     SUBDIR += jgraph
     SUBDIR += jgraphx
     SUBDIR += jikes
     SUBDIR += jlex
     SUBDIR += jlint
     SUBDIR += jmf
     SUBDIR += jode
     SUBDIR += jrosetta
     SUBDIR += jta
     SUBDIR += jtiger
     SUBDIR += jump
     SUBDIR += junit
     SUBDIR += jxgrabkey
     SUBDIR += lightweight-java-profiler
     SUBDIR += linux-oracle-jdk18
     SUBDIR += linux-oracle-jre18
     SUBDIR += linux-oracle-serverjre10
     SUBDIR += mmake
     SUBDIR += netbeans
     SUBDIR += netrexx
     SUBDIR += netty
     SUBDIR += openjdk11
     SUBDIR += openjdk11-jre
     SUBDIR += openjdk17
     SUBDIR += openjdk17-jre
     SUBDIR += openjdk18
     SUBDIR += openjdk19
     SUBDIR += openjdk20
     SUBDIR += openjdk21
+    SUBDIR += openjdk21-jre
     SUBDIR += openjdk22
     SUBDIR += openjdk23
     SUBDIR += openjdk24
     SUBDIR += openjdk8
     SUBDIR += openjdk8-jre
     SUBDIR += openjfx14
     SUBDIR += phpeclipse
     SUBDIR += proguard
     SUBDIR += sigar
     SUBDIR += springframework
     SUBDIR += springframework31
     SUBDIR += sqlitejdbc
     SUBDIR += trove4j
     SUBDIR += veditor
     SUBDIR += visualvm
     SUBDIR += wildfly
 
 .include <bsd.port.subdir.mk>
diff --git a/java/openjdk21-jre/Makefile b/java/openjdk21-jre/Makefile
new file mode 100644
index 000000000000..75617c44a9a9
--- /dev/null
+++ b/java/openjdk21-jre/Makefile
@@ -0,0 +1,8 @@
+PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-jre
+
+COMMENT=	Java Runtime Environment ${JDK_MAJOR_VERSION}
+
+BUILD_JRE=	yes
+MASTERDIR=	${.CURDIR}/../openjdk21
+
+.include "${MASTERDIR}/Makefile"