diff --git a/net/serviio/Makefile b/net/serviio/Makefile
index 41fd3fa33f02..7061f74f7029 100644
--- a/net/serviio/Makefile
+++ b/net/serviio/Makefile
@@ -1,58 +1,58 @@
 # Created by: Mikhail Teterin <mi@aldan.algebra.com>
 
 PORTNAME=	serviio
-PORTVERSION=	2.1
-PORTREVISION=	2
+PORTVERSION=	2.2.1
+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
 
 # 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 log4j
+.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
 #	${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 fbbff6176a4e..cbd09c2f8250 100644
--- a/net/serviio/distinfo
+++ b/net/serviio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588579013
-SHA256 (serviio-2.1-linux.tar.gz) = 51748160b38e31ba54db1b11381d3d9d705852ed7757ad111e881327a16fb757
-SIZE (serviio-2.1-linux.tar.gz) = 29354372
+TIMESTAMP = 1639505046
+SHA256 (serviio-2.2.1-linux.tar.gz) = b9145628cbf87f66f5c8813d3a75c3219026728ab0ffc174cf52ce7ac401b324
+SIZE (serviio-2.2.1-linux.tar.gz) = 28789070
diff --git a/net/serviio/files/patch-log4j2 b/net/serviio/files/patch-log4j2
new file mode 100644
index 000000000000..35948fb9117b
--- /dev/null
+++ b/net/serviio/files/patch-log4j2
@@ -0,0 +1,11 @@
+--- /var/ports/root/net/serviio/work/serviio-2.2.1/config/log4j2.xml.orig	2021-12-14 19:08:41.946554000 +0100
++++ /var/ports/root/net/serviio/work/serviio-2.2.1/config/log4j2.xml	2021-12-14 19:09:19.554143000 +0100
+@@ -9,7 +9,7 @@
+ <Configuration>
+ 
+     <Appenders>
+-        <RollingFile name="FILE" fileName="${sys:serviio.home}/log/serviio.log" filePattern="${sys:serviio.home}/log/serviio.log.%i">
++        <RollingFile name="FILE" fileName="/var/log/serviio/serviio.log" filePattern="/var/log/serviio/serviio.log.%i">
+             <PatternLayout pattern="%d{ISO8601} %-5p [%c{1}] %m%n" />
+             <Policies>
+                 <SizeBasedTriggeringPolicy size="5000KB" />
diff --git a/net/serviio/files/patch-logging b/net/serviio/files/patch-logging
index 01511b7fa229..9296bef10382 100644
--- a/net/serviio/files/patch-logging
+++ b/net/serviio/files/patch-logging
@@ -1,31 +1,10 @@
 The derby.properties is not currently being installed -- defaults
 seem to work fine...
 
 --- library/derby.properties	2010-08-06 17:18:38.000000000 -0400
 +++ library/derby.properties	2011-01-03 01:53:46.000000000 -0500
 @@ -1,3 +1,2 @@
 -derby.stream.error.file=../log/derby.log
  derby.storage.pageSize=8192
  derby.storage.pageCacheSize=3000
 
-The port makes sure, the below file is only used to configure logging of
-serviio-daemon process. The console is configured separately -- by
-default it simply logs everything to stderr.
-
---- config/log4j.xml	2011-01-23 14:24:59.000000000 -0500
-+++ config/log4j.xml	2011-02-04 00:13:33.000000000 -0500
-@@ -1,3 +1,3 @@
--<?xml version="1.0" encoding="UTF-8"?>
-+<?xml version="1.0" encoding="US-ASCII"?>
- <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
- 
-@@ -10,8 +10,8 @@
- <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
- 
- 	 <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
- 	 	<param name="Threshold" value="DEBUG"/>
- 	 	<param name="Append" value="true" />
--		<param name="File" value="${serviio.home}/log/serviio.log" />
-+		<param name="File" value="/var/log/serviio/serviio.log" />
- 		<param name="MaxFileSize" value="500KB" />
- 		<param name="MaxBackupIndex" value="5" />	
diff --git a/net/serviio/pkg-plist b/net/serviio/pkg-plist
index 82850f823b01..4f4638a9d451 100644
--- a/net/serviio/pkg-plist
+++ b/net/serviio/pkg-plist
@@ -1,58 +1,57 @@
 %%JAVAJARDIR%%/serviio/activation.jar
-%%JAVAJARDIR%%/serviio/aspectjrt.jar
-%%JAVAJARDIR%%/serviio/aspectjweaver.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.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/slf4j-log4j12.jar
 %%JAVAJARDIR%%/serviio/stax-api.jar
 %%JAVAJARDIR%%/serviio/stax-ex.jar
 %%JAVAJARDIR%%/serviio/streamflyer-core.jar
 %%JAVAJARDIR%%/serviio/winp.jar
 %%JAVAJARDIR%%/serviio/xstream.jar
 @sample %%ETCDIR%%/application-profiles.xml.sample
 @sample %%ETCDIR%%/console-log4j.properties.sample
-@sample %%ETCDIR%%/log4j.xml.sample
+@sample %%ETCDIR%%/log4j2.xml.sample
 @sample %%ETCDIR%%/profiles.xml.sample
 @sample %%ETCDIR%%/serviio.jks.sample
 sbin/serviiod