diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 4badb98a5edf..1f6f15f2edec 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,54 +1,54 @@
 # Created by: Wen heping<wenheping@gmail.com>
 
 PORTNAME=	geoserver
-PORTVERSION=	2.20.0
+PORTVERSION=	2.20.1
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Open Source GIS server
 
 LICENSE=	APACHE20 BSD2CLAUSE EPL GPLv2 GPLv3 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/NOTICE.md
 
 USES=		cpe zip
 USE_JAVA=	yes
 
 NO_BUILD=	yes
 
 NO_WRKSUBDIR=	yes
 GEOSERVERDIR=	${PREFIX}/${PORTNAME}
 GEODIRS=	data_dir etc lib logs modules resources webapps
 
 USE_RC_SUBR=	${PORTNAME}
-PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=26.0 MVER=${PORTVERSION} \
+PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=26.1 MVER=${PORTVERSION} \
 		VER3=1.1.3 BATIK=1.14 GWC=1.20.0 ECLIPSE=2.15.0 JETTY=9.4.36.v20210114 \
 		IMAGEIO=1.3.10 JT=1.1.20 JT1=1.6.0 SPRING=5.1.20 SPRINGS=5.1.13 SI=2.0.1 \
 		WICKET=7.18.0
 SUB_LIST=	GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
 SUB_FILES=	pkg-message
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$GEOSERVER_HOME|${GEOSERVERDIR}|g' \
 		-e 's|%%JAVA%%|${JAVA}|g' \
 		${WRKSRC}/bin/startup.sh ${WRKSRC}/bin/shutdown.sh
 	@(cd ${WRKSRC}/etc;${FIND} -E . -type f -iregex ".*(keystore|\.(xml|properties))") \
 		| while read a; do \
 			${MV} ${WRKSRC}/etc/$$a ${WRKSRC}/etc/$$a.sample; \
 		done
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${GEOSERVERDIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.sh ${STAGEDIR}${GEOSERVERDIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/start.jar ${STAGEDIR}${GEOSERVERDIR}/
 	${INSTALL_DATA} ${WRKSRC}/start.ini ${STAGEDIR}${GEOSERVERDIR}/
 	(cd ${WRKSRC} && ${INSTALL_DATA} NOTICE.md README.txt RUNNING.txt license/* \
 		VERSION.txt start.jar ${STAGEDIR}${GEOSERVERDIR})
 .for dir in ${GEODIRS}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${GEOSERVERDIR})
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 041afa87b980..a5ed5b92ac10 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635436435
-SHA256 (geoserver-2.20.0-bin.zip) = 38e1b0b72559eca7c4850d6d48f729083dbd28b32668a9d46d6172ec6dec41e4
-SIZE (geoserver-2.20.0-bin.zip) = 106636870
+TIMESTAMP = 1638663782
+SHA256 (geoserver-2.20.1-bin.zip) = 0df484af828094d6bcfc18cc745891d1647cf320068c3637f656933ab7916db3
+SIZE (geoserver-2.20.1-bin.zip) = 106648851