diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index 563daa4d0660..ba9a296d586d 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -1,62 +1,63 @@
 PORTNAME=	syncthing
-DISTVERSION=	1.23.6
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+DISTVERSION=	1.23.7
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}-source-${DISTVERSIONFULL}
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Encrypted file sync tool
 WWW=		https://syncthing.net/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/${PORTNAME}/LICENSE
 
 USES=		cpe go:1.19,modules
 
-USE_RC_SUBR=	syncthing syncthing-discosrv syncthing-relaysrv syncthing-relaypoolsrv
+USE_RC_SUBR=	syncthing syncthing-discosrv syncthing-relaysrv \
+		syncthing-relaypoolsrv
 
 BINS=		syncthing stdiscosrv strelaysrv strelaypoolsrv
 
 .for x in ${BINS}
 PLIST_FILES+=	bin/${x}
 .endfor
 
 PORTDOCS=	*
 
 USERS=		syncthing
 GROUPS=		syncthing
 
 # Anonymize
-MAKE_ENV+=	BUILD_USER=ports BUILD_HOST=freebsd
+MAKE_ENV+=	BUILD_HOST=freebsd \
+		BUILD_USER=ports
 
 OPTIONS_DEFINE=	DOCS
 
 NO_WRKSUBDIR=	yes
 
 do-build:
 	@( cd ${WRKSRC}/${PORTNAME} ; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build ; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build stdiscosrv; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build strelaysrv; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build strelaypoolsrv; \
 		)
 
 do-test:
 	@( cd ${WRKSRC}/${PORTNAME} ; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade test ; \
 		)
 
 do-install:
 .for x in ${BINS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${x} \
 		${STAGEDIR}${PREFIX}/bin/
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in AUTHORS LICENSE README.md
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${x} \
 		${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo
index 572d87f51b99..e13c5ef9afb7 100644
--- a/net/syncthing/distinfo
+++ b/net/syncthing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690749862
-SHA256 (syncthing-source-v1.23.6.tar.gz) = 6c49fef03d710fe2a6eaa9818a9a2c3017f9a2ec00d724748c2a187cb58dbe0e
-SIZE (syncthing-source-v1.23.6.tar.gz) = 14213659
+TIMESTAMP = 1691580733
+SHA256 (syncthing-source-v1.23.7.tar.gz) = 18d8dd74d8077f500a139752261b78217ef0b0a912a7c017192097a7196e21a1
+SIZE (syncthing-source-v1.23.7.tar.gz) = 14314457