diff --git a/devel/gopls/Makefile b/devel/gopls/Makefile
index 420d9bdc9a2f..3dde72605fce 100644
--- a/devel/gopls/Makefile
+++ b/devel/gopls/Makefile
@@ -1,24 +1,23 @@
 PORTNAME=	gopls
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.20.0
-PORTREVISION=	6
+DISTVERSION=	0.21.0
 CATEGORIES=	devel
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Go language LSP server
 WWW=		https://pkg.go.dev/golang.org/x/tools/gopls
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:1.24+,modules
+USES=		go:1.25+,modules
 GO_MODULE=	golang.org/x/tools/gopls
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "README.md doc" ${STAGEDIR}${DOCSDIR}
 	${RM} ${STAGEDIR}${DOCSDIR}/doc/*.go
 
 .include <bsd.port.mk>
diff --git a/devel/gopls/distinfo b/devel/gopls/distinfo
index 39d59afb00ff..dc68138e50c7 100644
--- a/devel/gopls/distinfo
+++ b/devel/gopls/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1754048789
-SHA256 (go/devel_gopls/gopls-v0.20.0/v0.20.0.mod) = 74f06762e74281c9d75a818b97f7a358457d54c85657526bb3e99cefc80387a6
-SIZE (go/devel_gopls/gopls-v0.20.0/v0.20.0.mod) = 1110
-SHA256 (go/devel_gopls/gopls-v0.20.0/v0.20.0.zip) = ebaeab7ce9e90b2f50bd15688843f6f6392897532cdc4826b34a5454d0153357
-SIZE (go/devel_gopls/gopls-v0.20.0/v0.20.0.zip) = 2262520
+TIMESTAMP = 1765639724
+SHA256 (go/devel_gopls/gopls-v0.21.0/v0.21.0.mod) = 45093913c30d49f09eef566b23da6705fa7b1e61d2b2c729814b525ed601fa61
+SIZE (go/devel_gopls/gopls-v0.21.0/v0.21.0.mod) = 1262
+SHA256 (go/devel_gopls/gopls-v0.21.0/v0.21.0.zip) = f366328e7b5e9cc5a596201c78ed5d29007f2826e0344ffa1a043d2dbe8286c8
+SIZE (go/devel_gopls/gopls-v0.21.0/v0.21.0.zip) = 2226113
diff --git a/devel/gopls/pkg-plist b/devel/gopls/pkg-plist
index a23d52446351..ab3302d19ce1 100644
--- a/devel/gopls/pkg-plist
+++ b/devel/gopls/pkg-plist
@@ -1,43 +1,44 @@
 bin/gopls
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/README.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/advanced.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/analyzers.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/codelenses.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/command-line.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/contributing.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/daemon.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/default.tmpl
 %%PORTDOCS%%%%DOCSDIR%%/doc/design/architecture.svg
 %%PORTDOCS%%%%DOCSDIR%%/doc/design/design.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/design/implementation.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/design/integrating.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/editor/emacs.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/editor/helix.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/editor/sublime.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/editor/vim.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/editor/zed.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/README.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/assembly.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/completion.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/diagnostics.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/index.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/mcp.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/modfiles.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/navigation.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/passive.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/templates.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/transformation.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/web.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/index.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/inlayHints.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/release/README
 %%PORTDOCS%%%%DOCSDIR%%/doc/release/v0.16.0.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/release/v0.17.0.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/release/v0.18.0.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/release/v0.19.0.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/release/v0.20.0.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/release/v0.21.0.md
+%%PORTDOCS%%%%DOCSDIR%%/doc/release/v0.22.0.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/settings.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/troubleshooting.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/workspace.md