diff --git a/devel/gopls/Makefile b/devel/gopls/Makefile
index 9df7b0953f01..b5990a2e0b18 100644
--- a/devel/gopls/Makefile
+++ b/devel/gopls/Makefile
@@ -1,24 +1,23 @@
 PORTNAME=	gopls
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.17.1
-PORTREVISION=	3
+DISTVERSION=	0.18.1
 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.23,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 7943f8f62209..dd03962a8673 100644
--- a/devel/gopls/distinfo
+++ b/devel/gopls/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1735033759
-SHA256 (go/devel_gopls/gopls-v0.17.1/v0.17.1.mod) = 33d5938fbf7ffa6458bed580ea5361514310411a02f997333848ba1fefb9abc3
-SIZE (go/devel_gopls/gopls-v0.17.1/v0.17.1.mod) = 854
-SHA256 (go/devel_gopls/gopls-v0.17.1/v0.17.1.zip) = 009b9bfed486e1f6d388dc8b8bf8aae88dfa03b7a41643d897f02c69cffe0df0
-SIZE (go/devel_gopls/gopls-v0.17.1/v0.17.1.zip) = 1965559
+TIMESTAMP = 1740588098
+SHA256 (go/devel_gopls/gopls-v0.18.1/v0.18.1.mod) = 9ab337e242f261e3d2c0c8f1aab05aa5a8ea851ab3dc7e62fe5844d58226dcb6
+SIZE (go/devel_gopls/gopls-v0.18.1/v0.18.1.mod) = 922
+SHA256 (go/devel_gopls/gopls-v0.18.1/v0.18.1.zip) = 7646c9dd6b9339b16e37f0ea0cb653ead042f9daa73b80e85df222a606ca1bbc
+SIZE (go/devel_gopls/gopls-v0.18.1/v0.18.1.zip) = 2100141
diff --git a/devel/gopls/pkg-plist b/devel/gopls/pkg-plist
index 8248a6214216..cee4c2fda431 100644
--- a/devel/gopls/pkg-plist
+++ b/devel/gopls/pkg-plist
@@ -1,40 +1,41 @@
 bin/gopls
 %%PORTDOCS%%%%DOCSDIR%%/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/design/architecture.svg
 %%PORTDOCS%%%%DOCSDIR%%/doc/design/design.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/design/implementation.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/design/integrating.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/emacs.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/README.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/completion.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/features/diagnostics.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/generate/generate.go
 %%PORTDOCS%%%%DOCSDIR%%/doc/generate/generate_test.go
 %%PORTDOCS%%%%DOCSDIR%%/doc/helix.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/inlayHints.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/inline-after.png
 %%PORTDOCS%%%%DOCSDIR%%/doc/inline-before.png
 %%PORTDOCS%%%%DOCSDIR%%/doc/refactor-inline.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/releases.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/semantictokens.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/settings.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/subl.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/troubleshooting.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/vim.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/workspace.md
 %%PORTDOCS%%%%DOCSDIR%%/doc/zeroconfig.png