diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index ebecfdf2944d..1e04d87a1430 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	gitaly
-DISTVERSION=	16.0.7
+DISTVERSION=	16.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Smart reverse proxy for GitLab
 WWW=		https://gitlab.com/gitlab-org/gitaly
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # Make sure the following patch is included:
 # https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4108
 # it fixes segfaults reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259848
 
 # define dependencies that are required for build and run under MY_DEPENDS
 MY_DEPENDS=	git>=2.40.1:devel/git
 BUILD_DEPENDS=	bash>0:shells/bash \
 		${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS} \
 		gitlab-shell>=14.17.0:devel/gitlab-shell
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cpe gmake go:modules,no_targets pkgconfig
 
 CPE_VENDOR=	gitlab
 
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 # make sure to pass go build options into make process
 MAKE_ENV+=	${GO_ENV}
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	7a3f36982c2499c363022fd62abb573a1b283c28
+GL_COMMIT=	0cf67be3b9ab59afc98f4c598be58d9bf1d45a57
 
 # for go dependencies
 # Gitlab hosts there dependencies on their own platform and not on go-proxy
 # so we download the required go.mod file from gitlab
 # lines are taken from go.mk
 # ---------------------------
 FETCH_DEPENDS=	${GO_CMD}:${GO_PORT} \
 		ca_root_nss>0:security/ca_root_nss
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitaly/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
 DIST_SUBDIR=	go/${PKGORIGIN:S,/,_,g}/${DISTNAME}
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//}
 _USES_fetch+=	800:go-post-fetch
 go-post-fetch:
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
 	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
 		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
 		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
 # ---------------------------
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
 	${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	(cd ${WRKSRC}/_build/bin/ && ${COPYTREE_SHARE} .  ${STAGEDIR}${DATADIR}/bin && \
 	cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample  ${STAGEDIR}${DATADIR})
 
 post-install:
 	${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #; \
 		/gitlab-shell-hook$$/ s#^#@(,,755) #; \
 		s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 12dc2360a2e3..4a111d278d5c 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1688583935
-SHA256 (go/devel_gitaly/gitlab-org-gitaly-7a3f36982c2499c363022fd62abb573a1b283c28_GL0/go.mod) = a9d6d090f061cab00b5bcdbbddd08e0b02de1772b256ed3bec2f3c0d07b3c923
-SIZE (go/devel_gitaly/gitlab-org-gitaly-7a3f36982c2499c363022fd62abb573a1b283c28_GL0/go.mod) = 10483
-SHA256 (go/devel_gitaly/gitlab-org-gitaly-7a3f36982c2499c363022fd62abb573a1b283c28_GL0/gitlab-org-gitaly-7a3f36982c2499c363022fd62abb573a1b283c28_GL0.tar.gz) = 606d42ccc29b070bce539e06cd5fcb67b34356cf1fd9274875c202e11af22782
-SIZE (go/devel_gitaly/gitlab-org-gitaly-7a3f36982c2499c363022fd62abb573a1b283c28_GL0/gitlab-org-gitaly-7a3f36982c2499c363022fd62abb573a1b283c28_GL0.tar.gz) = 3460079
+TIMESTAMP = 1687452843
+SHA256 (go/devel_gitaly/gitlab-org-gitaly-0cf67be3b9ab59afc98f4c598be58d9bf1d45a57_GL0/go.mod) = 869d038756ee3f440edad81f05654cccb15a563cc4bbaee1971055ab280ebe3c
+SIZE (go/devel_gitaly/gitlab-org-gitaly-0cf67be3b9ab59afc98f4c598be58d9bf1d45a57_GL0/go.mod) = 10223
+SHA256 (go/devel_gitaly/gitlab-org-gitaly-0cf67be3b9ab59afc98f4c598be58d9bf1d45a57_GL0/gitlab-org-gitaly-0cf67be3b9ab59afc98f4c598be58d9bf1d45a57_GL0.tar.gz) = d6fa0bacba0ffbecc59fdf567cc2a41059e4e658fa9e0b331678bec4539a8715
+SIZE (go/devel_gitaly/gitlab-org-gitaly-0cf67be3b9ab59afc98f4c598be58d9bf1d45a57_GL0/gitlab-org-gitaly-0cf67be3b9ab59afc98f4c598be58d9bf1d45a57_GL0.tar.gz) = 3494723