diff --git a/devel/apache-log4j2/Makefile b/devel/apache-log4j2/Makefile
index 94ac3919f5fe..3384c83c2295 100644
--- a/devel/apache-log4j2/Makefile
+++ b/devel/apache-log4j2/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	log4j2
-PORTVERSION=	2.20.0
+PORTVERSION=	2.21.0
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/logging/log4j/${PORTVERSION}
 PKGNAMEPREFIX=	apache-
 DISTNAME=	apache-log4j-${PORTVERSION}-bin
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Fast and flexible logging library for Java
 WWW=		https://logging.apache.org/log4j/2.x/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		cpe
+USES=		cpe zip
 
+NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	8+
 NO_BUILD=	yes
 NO_ARCH=	yes
 CPE_VENDOR=	apache
 CPE_PRODUCT=	log4j
 
-PORTDOCS=	NOTICE.txt RELEASE-NOTES.md
+PORTDOCS=	NOTICE.txt RELEASE-NOTES.adoc
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	cd ${WRKSRC} && \
 	for j in `${FIND} . -name "*${PORTVERSION}.jar"`; do \
 		${INSTALL_DATA} $$j ${STAGEDIR}${JAVAJARDIR}/`echo $$j | ${SED} -e 's|-${PORTVERSION}||'`; \
 	done
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/apache-log4j2/distinfo b/devel/apache-log4j2/distinfo
index c23094abeb70..10bbd74e0ad2 100644
--- a/devel/apache-log4j2/distinfo
+++ b/devel/apache-log4j2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678877961
-SHA256 (apache-log4j-2.20.0-bin.tar.gz) = f7ef6827941021b93b27eabbf35cec7ba52a4ab940204d716de7d0ec68b10e30
-SIZE (apache-log4j-2.20.0-bin.tar.gz) = 5375394
+TIMESTAMP = 1697971857
+SHA256 (apache-log4j-2.21.0-bin.zip) = 574c32c8756d774515271c06f5d64a53e2d90844fbe9c14c3489cc7d3a69a62f
+SIZE (apache-log4j-2.21.0-bin.zip) = 3200893
diff --git a/devel/apache-log4j2/pkg-plist b/devel/apache-log4j2/pkg-plist
index 590e0374e987..323644601cd3 100644
--- a/devel/apache-log4j2/pkg-plist
+++ b/devel/apache-log4j2/pkg-plist
@@ -1,32 +1,30 @@
 %%JAVAJARDIR%%/log4j-1.2-api.jar
 %%JAVAJARDIR%%/log4j-api.jar
 %%JAVAJARDIR%%/log4j-api-test.jar
 %%JAVAJARDIR%%/log4j-appserver.jar
 %%JAVAJARDIR%%/log4j-cassandra.jar
 %%JAVAJARDIR%%/log4j-core.jar
 %%JAVAJARDIR%%/log4j-core-test.jar
 %%JAVAJARDIR%%/log4j-couchdb.jar
 %%JAVAJARDIR%%/log4j-docker.jar
 %%JAVAJARDIR%%/log4j-flume-ng.jar
 %%JAVAJARDIR%%/log4j-iostreams.jar
 %%JAVAJARDIR%%/log4j-jakarta-smtp.jar
 %%JAVAJARDIR%%/log4j-jakarta-web.jar
 %%JAVAJARDIR%%/log4j-jcl.jar
 %%JAVAJARDIR%%/log4j-jdbc-dbcp2.jar
-%%JAVAJARDIR%%/log4j-jmx-gui.jar
 %%JAVAJARDIR%%/log4j-jpa.jar
 %%JAVAJARDIR%%/log4j-jpl.jar
 %%JAVAJARDIR%%/log4j-jul.jar
 %%JAVAJARDIR%%/log4j-kubernetes.jar
 %%JAVAJARDIR%%/log4j-layout-template-json.jar
 %%JAVAJARDIR%%/log4j-mongodb3.jar
 %%JAVAJARDIR%%/log4j-mongodb4.jar
-%%JAVAJARDIR%%/log4j-osgi.jar
 %%JAVAJARDIR%%/log4j-slf4j-impl.jar
 %%JAVAJARDIR%%/log4j-slf4j2-impl.jar
 %%JAVAJARDIR%%/log4j-spring-boot.jar
 %%JAVAJARDIR%%/log4j-spring-cloud-config-client.jar
 %%JAVAJARDIR%%/log4j-taglib.jar
 %%JAVAJARDIR%%/log4j-to-jul.jar
 %%JAVAJARDIR%%/log4j-to-slf4j.jar
 %%JAVAJARDIR%%/log4j-web.jar