diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
index 7908273b19c7..71e907922940 100644
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@@ -1,35 +1,35 @@
 # Created by: Alexander Logvinov <ports@logvinov.com>
 
 PORTNAME=	geoserver
-PORTVERSION=	2.20.3
+PORTVERSION=	2.21.0
 CATEGORIES=	databases geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}/extensions
 PKGNAMESUFFIX=	-mysql-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	MySQL DataStore implementation for GeoServer
 
 LICENSE=	LGPL21
 
 RUN_DEPENDS=	${LOCALBASE}/geoserver/start.jar:graphics/geoserver
 
 USES=		cpe zip
 
 CPE_VENDOR=	osgeo
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
 GSLIBDIR=	geoserver/webapps/geoserver/WEB-INF/lib
-PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-26.3.jar \
+PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-27.0.jar \
 		${GSLIBDIR}/mysql-connector-java-8.0.23.jar
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${GSLIBDIR}
 .for f in ${PLIST_FILES:S,^${GSLIBDIR}/,,}
 	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/${GSLIBDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/geoserver-mysql-plugin/distinfo b/databases/geoserver-mysql-plugin/distinfo
index a9304bfba6c3..c9347c2629cd 100644
--- a/databases/geoserver-mysql-plugin/distinfo
+++ b/databases/geoserver-mysql-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646764446
-SHA256 (geoserver-2.20.3-mysql-plugin.zip) = 0d02874a96f71b5bf62d4d2ddefe28d9c58804ad7a513558eb89d82baed55f2c
-SIZE (geoserver-2.20.3-mysql-plugin.zip) = 2316828
+TIMESTAMP = 1654111455
+SHA256 (geoserver-2.21.0-mysql-plugin.zip) = d04a16c687439825a47cb9e58609b83d4b5edf476d2d72962edb2cd3b203af5b
+SIZE (geoserver-2.21.0-mysql-plugin.zip) = 2316911