diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index c6557269d7e3..dcc6a3298503 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 
 PORTNAME=	tomcat
-DISTVERSION=	10.1.0-M2
+DISTVERSION=	10.1.0-M4
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
@@ -17,7 +17,7 @@ RUN_DEPENDS=	jsvc:devel/apache-commons-daemon
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	11+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes
diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo
index 67c634084599..5740780a10c2 100644
--- a/www/tomcat-devel/distinfo
+++ b/www/tomcat-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626175586
-SHA256 (apache-tomcat-10.1.0-M2.tar.gz) = dfebb2cebf4dd6fdde5b16224ddafb86b2199bea29b9ad3412f811264da67fc4
-SIZE (apache-tomcat-10.1.0-M2.tar.gz) = 11825772
+TIMESTAMP = 1628336355
+SHA256 (apache-tomcat-10.1.0-M4.tar.gz) = ab27d197dad226415468ce21f9017d13bbe7ac71d485f86cacba2b7f94a09908
+SIZE (apache-tomcat-10.1.0-M4.tar.gz) = 11823231
diff --git a/www/tomcat-devel/pkg-descr b/www/tomcat-devel/pkg-descr
index a94570a0ba69..ecefdc1f5a59 100644
--- a/www/tomcat-devel/pkg-descr
+++ b/www/tomcat-devel/pkg-descr
@@ -1,7 +1,7 @@
 Apache Tomcat is a web server written in 100% Pure Java.
 
 Apache Tomcat 10.1.x is the current focus of development. It builds on
-Tomcat 10.0.x and implements the Servlet 5.1, JSP TBD, EL TBD, WebSocket TBD
+Tomcat 10.0.x and implements the Servlet 6.0, JSP TBD, EL TBD, WebSocket TBD
 and Authentication TBD specifications (the versions required by Jakarta EE 10
 platform).
 
diff --git a/www/tomcat-devel/pkg-plist b/www/tomcat-devel/pkg-plist
index a873bd120bee..a073fca3c923 100644
--- a/www/tomcat-devel/pkg-plist
+++ b/www/tomcat-devel/pkg-plist
@@ -321,11 +321,9 @@
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/listeners/SessionListener.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/ByteCounter$1.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/ByteCounter$CounterListener.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/ByteCounter.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/ByteCounter.java
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/NumberWriter$1.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/NumberWriter$NumberWriterListener.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/NumberWriter.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/NumberWriter.java
@@ -335,7 +333,6 @@
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/trailers/ResponseTrailers.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/trailers/ResponseTrailers.java
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/trailers/ResponseTrailers$1.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/trailers/ResponseTrailers$TrailerFieldSupplier.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/util/CookieFilter.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/util/CookieFilter.java
@@ -378,11 +375,9 @@
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/StringWebsocketMessage.java
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation$1.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation$CompletedFuture.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$1.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$EchoMessageHandlerBinary.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$EchoMessageHandlerText.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.class