diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
index c18b8fcc4000..b2a5c1841383 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -53,7 +53,7 @@
 # GO_TESTFLAGS
 #	Additional build arguments to be passed to the `go test` command
 #
-# MAINTAINER: ports@FreeBSD.org
+# MAINTAINER: go@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GO_MK)
 _INCLUDE_USES_GO_MK=	yes
diff --git a/lang/go-devel/Makefile b/lang/go-devel/Makefile
index 28116dcebbb3..f74bfa1fd029 100644
--- a/lang/go-devel/Makefile
+++ b/lang/go-devel/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES?=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRA
 PKGNAMESUFFIX=	${DISTVERSION:C/^g[0-9]+/-devel/:C/^([0-9]+)\.([0-9]+).*/\1\2/}
 DISTFILES?=	go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
 
-MAINTAINER=	ygy@FreeBSD.org
+MAINTAINER=	go@FreeBSD.org
 COMMENT?=	Go programming language (development version)
 
 LICENSE=	BSD3CLAUSE
diff --git a/lang/go/Makefile b/lang/go/Makefile
index d41b2832c22b..76f6d5bc891c 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	lang
 MASTER_SITES=	# not applicable
 DISTFILES=	# not applicable
 
-MAINTAINER=	dmgk@FreeBSD.org
+MAINTAINER=	go@FreeBSD.org
 COMMENT=	Meta-port for the default version of the Go programming language
 
 RUN_DEPENDS=	go${GO_SUFFIX}:lang/go${GO_SUFFIX}