diff --git a/devel/gh/Makefile b/devel/gh/Makefile
index f394f8df3112..c51931f56ef7 100644
--- a/devel/gh/Makefile
+++ b/devel/gh/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	gh
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.35.0
+DISTVERSION=	2.37.0
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	GitHub's official command line tool
 WWW=		https://cli.github.com
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	git:devel/git
 
-USES=		go:modules
+USES=		go:1.21,modules
 
 _BUILD_VERSION=	${DISTVERSION}
 _BUILD_DATE=	$$(date +%Y-%m-%d)
 
 GO_MODULE=	github.com/cli/cli/v2
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
 		-X ${GO_MODULE}/internal/build.Version=${_BUILD_VERSION} \
 		-X ${GO_MODULE}/internal/build.Date=${_BUILD_DATE}"
 
 _DOCS=		README.md docs/[!README]*.md
 PORTDOCS=	${_DOCS:T}
 
 OPTIONS_DEFINE=		COMPLETIONS DOCS MANPAGES
 OPTIONS_DEFAULT=	COMPLETIONS MANPAGES
 OPTIONS_SUB=		yes
 
 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}
 
 do-build-MANPAGES-on:
 	(cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} run ${GO_BUILDFLAGS} \
 		./cmd/gen-docs --man-page --doc-path docs/man 2>/dev/null)
 
 post-install-COMPLETIONS-on:
 .for _shell in bash fish zsh
 	${GO_WRKDIR_BIN}/${PORTNAME} completion -s ${_shell} \
 		>${STAGEDIR}${PREFIX}/${COMPLETIONS_PLIST_FILES:M*${_shell}*}
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && \
 		${INSTALL_DATA} ${_DOCS} \
 		${STAGEDIR}${DOCSDIR})
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/*.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/gh/distinfo b/devel/gh/distinfo
index a6d5004f2558..6750f7a687c4 100644
--- a/devel/gh/distinfo
+++ b/devel/gh/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1696108620
-SHA256 (go/devel_gh/gh-v2.35.0/v2.35.0.mod) = b2a221f073f821d61f9a9a3fa3cd7e833a3ab15e05dba22e3eba768ecd197462
-SIZE (go/devel_gh/gh-v2.35.0/v2.35.0.mod) = 3729
-SHA256 (go/devel_gh/gh-v2.35.0/v2.35.0.zip) = 83544c297997025b02f336d2c5042741b0a3c68e757bbf5a344c77a40a9878d1
-SIZE (go/devel_gh/gh-v2.35.0/v2.35.0.zip) = 1345518
+TIMESTAMP = 1697665747
+SHA256 (go/devel_gh/gh-v2.37.0/v2.37.0.mod) = 61306f80660e17e56986fdadb14bfd7da62d3b4255114202ec1aae240359ecb8
+SIZE (go/devel_gh/gh-v2.37.0/v2.37.0.mod) = 3776
+SHA256 (go/devel_gh/gh-v2.37.0/v2.37.0.zip) = 9342c67207bc52963d69738782b08a806c1e1fe6be8cca5eed6461c7f94001ce
+SIZE (go/devel_gh/gh-v2.37.0/v2.37.0.zip) = 1341292