diff --git a/net/serviio/Makefile b/net/serviio/Makefile
index 91e69ab8bd8c..3efdf9c0ba81 100644
--- a/net/serviio/Makefile
+++ b/net/serviio/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	serviio
-PORTVERSION=	2.2.1
+PORTVERSION=	2.3
 PORTREVISION=	0
 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=	1.8
 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
-mkplist:
-	${FIND} ${STAGEDIR}${PREFIX}/ -type f | ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; s:share/java/classes:%%JAVAJARDIR%%:g ; s:etc/serviio:@sample %%ETCDIR%%:g" | ${GREP} -v etc/rc.d | ${SORT} >${PLIST}.new
+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/distinfo b/net/serviio/distinfo
index cbd09c2f8250..aaa9a20dce61 100644
--- a/net/serviio/distinfo
+++ b/net/serviio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639505046
-SHA256 (serviio-2.2.1-linux.tar.gz) = b9145628cbf87f66f5c8813d3a75c3219026728ab0ffc174cf52ce7ac401b324
-SIZE (serviio-2.2.1-linux.tar.gz) = 28789070
+TIMESTAMP = 1666604910
+SHA256 (serviio-2.3-linux.tar.gz) = 9e6dd13720b8a269c6723eced7870b2486674ff5c6358fdde6a11c168c3ff627
+SIZE (serviio-2.3-linux.tar.gz) = 28885139
diff --git a/net/serviio/files/serviio.in b/net/serviio/files/serviio.in
index 34632a7f0be2..1a31e5054982 100644
--- a/net/serviio/files/serviio.in
+++ b/net/serviio/files/serviio.in
@@ -1,42 +1,46 @@
 #!/bin/sh
 
 # PROVIDE: serviio
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf[.local] to enable serviio:
 #
 # serviio_enable="YES"
 
 . /etc/rc.subr
 
 name=serviio
 rcvar=serviio_enable
 command=%%PREFIX%%/sbin/serviiod
 
 load_rc_config $name
 
 : ${serviio_user="dlna"}
+: ${serviio_heap="512M"}
+: ${serviio_stack="20M"}
 
 if [ -n "${serviio_lang}" ]; then
 	export LANG=${serviio_lang}
 fi
 
+export SERVIIO_MEM="-Xmx${serviio_heap} -Xms${serviio_stack}"
+
 _dirs="/var/db/serviio /var/db/serviio/home /var/log/serviio"
 start_precmd="mkdir -p $_dirs; chown $serviio_user $_dirs"
 command_args="$serviio_args &"
 
 stop_cmd="$command -stop"
 
 status_cmd=${name}_status
 serviio_status() {
 	serviio_pid=$(ps -wwwaU ${serviio_user} | awk '/java.*org.serviio.MediaServer/ {print $1}')
 	if [ -n "${serviio_pid}" ]; then
 		echo "${name} is running as pid ${serviio_pid}"
 	else
 		echo "${name} is not running"
 		return 1
 	fi
 }
 
 run_rc_command $1
diff --git a/net/serviio/files/serviiod.in b/net/serviio/files/serviiod.in
index 19f16560c49e..44864aac25b5 100644
--- a/net/serviio/files/serviiod.in
+++ b/net/serviio/files/serviiod.in
@@ -1,36 +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+"
 
 # 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 -Xmx512M -Xms20M -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@" 2>&1 >/dev/null
+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
diff --git a/net/serviio/pkg-plist b/net/serviio/pkg-plist
index 4f4638a9d451..830e850fe9ad 100644
--- a/net/serviio/pkg-plist
+++ b/net/serviio/pkg-plist
@@ -1,57 +1,57 @@
 %%JAVAJARDIR%%/serviio/activation.jar
 %%JAVAJARDIR%%/serviio/commons-codec.jar
 %%JAVAJARDIR%%/serviio/commons-imaging.jar
 %%JAVAJARDIR%%/serviio/commons-io.jar
 %%JAVAJARDIR%%/serviio/commons-jcs-core.jar
 %%JAVAJARDIR%%/serviio/commons-jxpath.jar
 %%JAVAJARDIR%%/serviio/commons-lang.jar
 %%JAVAJARDIR%%/serviio/commons-logging.jar
 %%JAVAJARDIR%%/serviio/derby.jar
 %%JAVAJARDIR%%/serviio/freemarker.jar
 %%JAVAJARDIR%%/serviio/groovy-all.jar
 %%JAVAJARDIR%%/serviio/gson.jar
 %%JAVAJARDIR%%/serviio/httpclient-cache.jar
 %%JAVAJARDIR%%/serviio/httpclient.jar
 %%JAVAJARDIR%%/serviio/httpcore.jar
 %%JAVAJARDIR%%/serviio/icu4j.jar
 %%JAVAJARDIR%%/serviio/imgscalr-lib.jar
 %%JAVAJARDIR%%/serviio/jaudiotagger.jar
 %%JAVAJARDIR%%/serviio/javax.xml.soap-api.jar
 %%JAVAJARDIR%%/serviio/jcl-over-slf4j.jar
 %%JAVAJARDIR%%/serviio/jdom.jar
 %%JAVAJARDIR%%/serviio/jnat-pmplib.jar
 %%JAVAJARDIR%%/serviio/jul-to-slf4j.jar
 %%JAVAJARDIR%%/serviio/log4j-api.jar
 %%JAVAJARDIR%%/serviio/log4j-core.jar
 %%JAVAJARDIR%%/serviio/log4j-slf4j-impl.jar
 %%JAVAJARDIR%%/serviio/lucene-analyzers-common.jar
 %%JAVAJARDIR%%/serviio/lucene-core.jar
 %%JAVAJARDIR%%/serviio/mimepull.jar
 %%JAVAJARDIR%%/serviio/org.restlet.ext.gson.jar
 %%JAVAJARDIR%%/serviio/org.restlet.ext.simple.jar
 %%JAVAJARDIR%%/serviio/org.restlet.ext.slf4j.jar
 %%JAVAJARDIR%%/serviio/org.restlet.ext.xstream.jar
 %%JAVAJARDIR%%/serviio/org.restlet.jar
 %%JAVAJARDIR%%/serviio/padlock.jar
 %%JAVAJARDIR%%/serviio/rome-modules.jar
 %%JAVAJARDIR%%/serviio/rome.jar
 %%JAVAJARDIR%%/serviio/saaj-impl.jar
-%%JAVAJARDIR%%/serviio/sbbi-upnp.jar
 %%JAVAJARDIR%%/serviio/serviio-mediabrowser-api.jar
 %%JAVAJARDIR%%/serviio/serviio-mediabrowser-web.jar
 %%JAVAJARDIR%%/serviio/serviio-web-console-api.jar
 %%JAVAJARDIR%%/serviio/serviio-web-console.jar
 %%JAVAJARDIR%%/serviio/serviio.jar
 %%JAVAJARDIR%%/serviio/simple.jar
 %%JAVAJARDIR%%/serviio/slf4j-api.jar
 %%JAVAJARDIR%%/serviio/stax-api.jar
 %%JAVAJARDIR%%/serviio/stax-ex.jar
 %%JAVAJARDIR%%/serviio/streamflyer-core.jar
+%%JAVAJARDIR%%/serviio/waifupnp.jar
 %%JAVAJARDIR%%/serviio/winp.jar
 %%JAVAJARDIR%%/serviio/xstream.jar
 @sample %%ETCDIR%%/application-profiles.xml.sample
 @sample %%ETCDIR%%/console-log4j.properties.sample
 @sample %%ETCDIR%%/log4j2.xml.sample
 @sample %%ETCDIR%%/profiles.xml.sample
 @sample %%ETCDIR%%/serviio.jks.sample
 sbin/serviiod