diff --git a/devel/golangci-lint/Makefile b/devel/golangci-lint/Makefile
index e2f66c06bb2b..8bfaa14ed7f0 100644
--- a/devel/golangci-lint/Makefile
+++ b/devel/golangci-lint/Makefile
@@ -1,58 +1,57 @@
 PORTNAME=	golangci-lint
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.62.2
-PORTREVISION=	3
+DISTVERSION=	2.1.5
 CATEGORIES=	devel
 
-MAINTAINER=	lcook@FreeBSD.org
+MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	Linters Runner for Go
 WWW=		https://github.com/golangci/golangci-lint
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake go:1.22,modules
+USES=		gmake go:1.23,modules
 
 _BUILD_VERSION=	${DISTVERSION}
 _BUILD_COMMIT=	89476e7
 _BUILD_DATE=	$$(date -u "+%Y-%m-%dT%H:%M:%SZ")
 
-GO_MODULE=	github.com/${PORTNAME:S/-lint//}/${PORTNAME}
+GO_MODULE=	github.com/${PORTNAME:S/-lint//}/${PORTNAME}/v2
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
 		-X main.version=${_BUILD_VERSION} \
 		-X main.commit=${_BUILD_COMMIT} \
 		-X main.date=${_BUILD_DATE}"
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CHANGELOG.md README.md
 PORTEXAMPLES=	.golangci.reference.yml
 
 OPTIONS_DEFINE=		COMPLETIONS DOCS EXAMPLES
 OPTIONS_DEFAULT=	COMPLETIONS
 
 COMPLETIONS_DESC=		Build and install bash, fish and zsh shell completions
 COMPLETIONS_PLIST_FILES=	share/bash-completion/completions/${PORTNAME} \
 				share/fish/vendor_completions.d/${PORTNAME}.fish \
 				share/zsh/site-functions/_${PORTNAME}
 
 BINARY_ALIAS=	make=gmake
 
 post-install-COMPLETIONS-on:
 .for _shell in bash fish zsh
 	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_WRKDIR_BIN}/${PORTNAME} completion ${_shell} \
 		>${STAGEDIR}${PREFIX}/${COMPLETIONS_PLIST_FILES:M*${_shell}*}
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/golangci-lint/distinfo b/devel/golangci-lint/distinfo
index 67bca6aae7e1..420853d8ef26 100644
--- a/devel/golangci-lint/distinfo
+++ b/devel/golangci-lint/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1734921304
-SHA256 (go/devel_golangci-lint/golangci-lint-v1.62.2/v1.62.2.mod) = d5642925cd7324e7b63551dd7837cd21230aea4da54c83d9f906946533ea7c6c
-SIZE (go/devel_golangci-lint/golangci-lint-v1.62.2/v1.62.2.mod) = 8564
-SHA256 (go/devel_golangci-lint/golangci-lint-v1.62.2/v1.62.2.zip) = 87d2ed0a3ffc8b630dd049c5878ed3bd66317e095a085a48d701282971e1e76a
-SIZE (go/devel_golangci-lint/golangci-lint-v1.62.2/v1.62.2.zip) = 2288895
+TIMESTAMP = 1746295170
+SHA256 (go/devel_golangci-lint/golangci-lint-v2.1.5/v2.1.5.mod) = d4436cfc877222ef95353ff40dbff34df18b39390c9597922753b8ea5d09f34f
+SIZE (go/devel_golangci-lint/golangci-lint-v2.1.5/v2.1.5.mod) = 9323
+SHA256 (go/devel_golangci-lint/golangci-lint-v2.1.5/v2.1.5.zip) = 4e69677eb96ebbd680b91b30e64f4707fb05a788469f920a42509458e0743388
+SIZE (go/devel_golangci-lint/golangci-lint-v2.1.5/v2.1.5.zip) = 2979567