diff --git a/net/serviio/Makefile b/net/serviio/Makefile
index 2097483d3040..832212a9595e 100644
--- a/net/serviio/Makefile
+++ b/net/serviio/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	serviio
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net multimedia java www
 MASTER_SITES=	https://download.serviio.org/releases/
 EXTRACT_SUFX=	-linux.tar.gz
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Transcoding DLNA-server implemented in Java
 WWW=		https://www.serviio.org/
 
 # Converted from RESTRICTED
 LICENSE=	serviio
 LICENSE_NAME=	serviio
 LICENSE_TEXT=	License does not allow selling
 LICENSE_PERMS=	auto-accept
 
 RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	8
+JAVA_VERSION=	21
 USES=		dos2unix
 DOS2UNIX_GLOB=	derby.properties
 
 PKGMESSAGE=	${WRKSRC}/pkg-message
 SUB_FILES+=	pkg-message serviiod
 USE_RC_SUBR=	serviio
 SUB_LIST+=	USER=${USERS}
 EXTRACT_AFTER_ARGS=--exclude junit.jar	\
 	--exclude org.restlet.ext.net.jar
 
 USERS=	dlna
 GROUPS=	dlna
 
 do-install:
 	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/plugins
 	${INSTALL_DATA} ${WRKSRC}/lib/*.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 .for f in application-profiles profiles log4j2
 	${INSTALL_DATA} ${WRKSRC}/config/$f.xml \
 		${STAGEDIR}${ETCDIR}/$f.xml.sample
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/config/serviio.jks \
 		${STAGEDIR}${ETCDIR}/serviio.jks.sample
 	${INSTALL_DATA} ${FILESDIR}/console-log4j.properties	\
 		${STAGEDIR}${ETCDIR}/console-log4j.properties.sample
 	${INSTALL_SCRIPT} ${WRKDIR}/serviiod ${STAGEDIR}${PREFIX}/sbin
 
 # to be used with a non-standard PREFIX for just this port
 # e.g. PREFIX=/porttest
 gen-plist:
 	${FIND} ${STAGEDIR}${PREFIX}/ -type f | ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; s:share/java/classes:%%JAVAJARDIR%%:g ; s:etc/serviio:@sample %%ETCDIR%%:g" | ${GREP} -Ev '(etc/rc.d|licenses)' | ${SORT} >${PLIST}.new
 #	${FIND} ${STAGEDIR}${PREFIX}/ -type d | ${SED} -e "s:${STAGEDIR}${PREFIX}/:@dirrm :g ; s:etc/serviio:%%ETCDIR%%:g ; s:share/java/classes:%%JAVAJARDIR%%:g" | ${SORT} -r >>${PLIST}.new
 
 .include <bsd.port.mk>
diff --git a/net/serviio/files/serviiod.in b/net/serviio/files/serviiod.in
index 44864aac25b5..69c103d0ac02 100644
--- a/net/serviio/files/serviiod.in
+++ b/net/serviio/files/serviiod.in
@@ -1,37 +1,37 @@
 #!/bin/sh
 ### ====================================================================== ###
 ##                                                                          ##
 ##  Serviio start Script                                                    ##
 ##                                                                          ##
 ### ====================================================================== ###
 
 PATH=$PATH:%%PREFIX%%/bin
 HOME=/var/db/serviio/home
 : ${SERVIIO_MEM="-Xmx512M -Xms20M"}
 SERVIIO_HOME=%%JAVAJARDIR%%/serviio
 SERVIIO_CLASS_PATH="$SERVIIO_HOME/serviio.jar"
 # Setup the classpath
 for j in $SERVIIO_HOME/*.jar
 do
 	SERVIIO_CLASS_PATH="$SERVIIO_CLASS_PATH:$j"
 done
 SERVIIO_CLASS_PATH="$SERVIIO_CLASS_PATH:%%ETCDIR%%"
 
 # Setup Serviio specific properties
 JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dorg.restlet.engine.loggerFacadeClass=org.restlet.ext.slf4j.Slf4jLoggerFacade -Dderby.system.home=/var/db/serviio -Dserviio.home=$HOME -Dffmpeg.location=%%LOCALBASE%%/bin/ffmpeg -Ddcraw.location=%%LOCALBASE%%/bin/dcraw"
 JAVA_OPTS="${JAVA_OPTS} -Djcs.auxiliary.DC.attributes.DiskPath=/var/db/serviio"
-JAVA_VERSION="1.8+"
+JAVA_VERSION="21+"
 
 # A kludge to get the -D... flags to Java, rather than to Serviio itself:
 for o in "$@"
 do
 	case $o in
 	-D*)
 		JAVA_OPTS="$JAVA_OPTS $o"
 		;;
 	esac
 done
 
 # Execute the JVM in the foreground
 export HOME PATH JAVA_VERSION
 exec java ${SERVIIO_MEM} -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@" 2>&1 >/dev/null