diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index fdce3309f0ba..e8881e7b2447 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	tomcat
-DISTVERSION=	11.0.0-M20
+DISTVERSION=	11.0.0-M21
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 11.0.x branch
 WWW=		https://tomcat.apache.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	jsvc:devel/apache-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	17+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 PLIST_SUB=	T=${TOMCAT_SUBDIR} \
 		WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP}
 SUB_LIST=	TOMCAT_HOME=${TOMCAT_HOME} \
 		TOMCAT_USER=${WWWOWN} \
 		JAVA_HOME=${JAVA_HOME}
 
 OPTIONS_DEFINE=		HOST_MANAGER MANAGER DOCS EXAMPLES ROOT NLS
 OPTIONS_DEFAULT=	HOST_MANAGER MANAGER ROOT
 OPTIONS_SUB=		yes
 
 DOCS_DESC=		Install Documentation web application
 EXAMPLES_DESC=		Install Examples web application
 HOST_MANAGER_DESC=	Install Host Manager application
 MANAGER_DESC=		Install Manager web application
 ROOT_DESC=		Install default ROOT web application
 
 TOMCAT_SUBDIR?=	${DISTNAME:R}${PKGNAMESUFFIX}
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 
 post-patch:
 	@${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh
 	@${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
 	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
 
 post-install:
 	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
 		for f in $$(find . -type f -not -name '*.xsd'); do ${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-on:
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/manager.xml host-manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-MANAGER-on:
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 .include <bsd.port.mk>
diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo
index 248ea300623d..3fe44ffd6617 100644
--- a/www/tomcat-devel/distinfo
+++ b/www/tomcat-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715173930
-SHA256 (apache-tomcat-11.0.0-M20.tar.gz) = 9e04f5af3e981bca833c06d2fa79ce37168146b81ad90a790c97f45a49807f92
-SIZE (apache-tomcat-11.0.0-M20.tar.gz) = 12994063
+TIMESTAMP = 1718746617
+SHA256 (apache-tomcat-11.0.0-M21.tar.gz) = 7ec1b7a8cd750b362b9bd320aecfce8208a09094c5d762381b54d29b12ff8e15
+SIZE (apache-tomcat-11.0.0-M21.tar.gz) = 13000189