diff --git a/devel/golangci-lint/Makefile b/devel/golangci-lint/Makefile
index d3711fc176d8..906bcd29e77a 100644
--- a/devel/golangci-lint/Makefile
+++ b/devel/golangci-lint/Makefile
@@ -1,64 +1,55 @@
 PORTNAME=	golangci-lint
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.50.1
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	Linters Runner for Go
 WWW=		https://github.com/golangci/golangci-lint
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 
 _BUILD_VERSION=	${DISTVERSION}
 _BUILD_COMMIT=	8926a95
 _BUILD_DATE=	$$(date -u "+%Y-%m-%dT%H:%M:%SZ")
 
 GO_MODULE=	github.com/${PORTNAME:S/-lint//}/${PORTNAME}
 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
-OPTIONS_SUB=		yes
 
-COMPLETIONS_DESC=	Build and install shell completions
-
-do-build-COMPLETIONS-on:
-.for SHELL in bash fish zsh
-	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_WRKDIR_BIN}/${PORTNAME} completion \
-		${SHELL} > ${WRKSRC}/${SHELL}
-.endfor
+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}
 
 post-install-COMPLETIONS-on:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \
-		${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d \
-		${STAGEDIR}${PREFIX}/share/zsh/site-functions
-
-	${INSTALL_DATA} ${WRKSRC}/bash \
-		${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/fish \
-		${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/${PORTNAME}.fish
-	${INSTALL_DATA} ${WRKSRC}/zsh \
-		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
+.for _shell in bash fish zsh
+	${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/pkg-plist b/devel/golangci-lint/pkg-plist
deleted file mode 100644
index 8942fc26095e..000000000000
--- a/devel/golangci-lint/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/golangci-lint
-%%COMPLETIONS%%etc/bash_completion.d/golangci-lint
-%%COMPLETIONS%%share/fish/vendor_completions.d/golangci-lint.fish
-%%COMPLETIONS%%share/zsh/site-functions/_golangci-lint