diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -48,7 +48,7 @@
 # Usage:	USES=autoreconf or USES=autoreconf:args
 # Valid args:	build	Don't run autoreconf, only add build dependencies
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_AUTORECONF_MK)
 _INCLUDE_USES_AUTORECONF_MK=	yes
diff --git a/Mk/Uses/bison.mk b/Mk/Uses/bison.mk
--- a/Mk/Uses/bison.mk
+++ b/Mk/Uses/bison.mk
@@ -9,7 +9,7 @@
 # 'wrapper'	will automatically create BINARY_WRAPPER to use base
 #		byacc with a wrapper to mimic a bit more bison
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_BISON_MK)
 _INCLUDE_USES_BISON_MK=	yes
diff --git a/Mk/Uses/charsetfix.mk b/Mk/Uses/charsetfix.mk
--- a/Mk/Uses/charsetfix.mk
+++ b/Mk/Uses/charsetfix.mk
@@ -4,7 +4,7 @@
 # Usage:	USES=charsetfix
 # Valid ARGS:	does not require args
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_CHARSETFIX_MK)
 _INCLUDE_USES_CHARSETFIX_MK=	yes
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk
--- a/Mk/Uses/compiler.mk
+++ b/Mk/Uses/compiler.mk
@@ -24,7 +24,7 @@
 # COMPILER_FEATURES:	the list of features supported by the compiler includes the standard C++ library.
 # CHOSEN_COMPILER_TYPE:	can be gcc or clang (type of compiler chosen by the framework)
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_COMPILER_MK)
 _INCLUDE_USES_COMPILER_MK=	yes
diff --git a/Mk/Uses/desthack.mk b/Mk/Uses/desthack.mk
--- a/Mk/Uses/desthack.mk
+++ b/Mk/Uses/desthack.mk
@@ -4,7 +4,7 @@
 # Usage:	USES=desthack
 # Valid ARGS:	none
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_DESTHACK_MK)
 _INCLUDE_USES_DESTHACK_MK=	yes
diff --git a/Mk/Uses/dos2unix.mk b/Mk/Uses/dos2unix.mk
--- a/Mk/Uses/dos2unix.mk
+++ b/Mk/Uses/dos2unix.mk
@@ -5,7 +5,7 @@
 # DOS2UNIX_GLOB		list of glob pattern find(1) will match with
 # DOS2UNIX_WRKSRC	top-level path for directory traversal instead of ${WRKSRC}
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_DOS2UNIX_MK)
 _INCLUDE_USES_DOS2UNIX_MK=	yes
diff --git a/Mk/Uses/fam.mk b/Mk/Uses/fam.mk
--- a/Mk/Uses/fam.mk
+++ b/Mk/Uses/fam.mk
@@ -1,4 +1,4 @@
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 #
 # Feature:	fam
 # Usage:	USES=fam or USES=fam:ARG
diff --git a/Mk/Uses/fuse.mk b/Mk/Uses/fuse.mk
--- a/Mk/Uses/fuse.mk
+++ b/Mk/Uses/fuse.mk
@@ -3,7 +3,7 @@
 # Feature:	fuse
 # Usage:	USES=fuse[:version]
 # Valid ARGS:	2 [default], 3
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_FUSE_MK)
 _INCLUDE_USES_FUSE_MK=	yes
diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk
--- a/Mk/Uses/gem.mk
+++ b/Mk/Uses/gem.mk
@@ -4,7 +4,7 @@
 # Usage:	USES=gem[:noautoplist]
 # Valid args:	noautoplist	Don't generate the plist automatically
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ruby@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GEM_MK)
 
diff --git a/Mk/Uses/gettext-runtime.mk b/Mk/Uses/gettext-runtime.mk
--- a/Mk/Uses/gettext-runtime.mk
+++ b/Mk/Uses/gettext-runtime.mk
@@ -4,7 +4,7 @@
 # Usage:	USES=gettext-runtime or USES=gettext-runtime:ARGS
 # Valid ARGS:	lib (default), build, run
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	tijl@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GETTEXT_RUNTIME_MK)
 _INCLUDE_USES_GETTEXT_RUNTIME_MK=	yes
diff --git a/Mk/Uses/gettext-tools.mk b/Mk/Uses/gettext-tools.mk
--- a/Mk/Uses/gettext-tools.mk
+++ b/Mk/Uses/gettext-tools.mk
@@ -4,7 +4,7 @@
 # Usage:	USES=gettext-tools or USES=gettext-tools:ARGS
 # Valid ARGS:	build (default), run
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	tijl@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GETTEXT_TOOLS_MK)
 _INCLUDE_USES_GETTEXT_TOOLS_MK=	yes
diff --git a/Mk/Uses/gettext.mk b/Mk/Uses/gettext.mk
--- a/Mk/Uses/gettext.mk
+++ b/Mk/Uses/gettext.mk
@@ -4,7 +4,7 @@
 # Feature:	gettext
 # Usage:	USES=gettext
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	tijl@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GETTEXT_MK)
 _INCLUDE_USES_GETTEXT_MK=	yes
diff --git a/Mk/Uses/gmake.mk b/Mk/Uses/gmake.mk
--- a/Mk/Uses/gmake.mk
+++ b/Mk/Uses/gmake.mk
@@ -3,7 +3,7 @@
 # Feature:		gmake
 # Usage:		USES=gmake
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: tijl@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GMAKE_MK)
 _INCLUDE_USES_GMAKE_MK=	yes
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk
--- a/Mk/Uses/iconv.mk
+++ b/Mk/Uses/iconv.mk
@@ -6,7 +6,7 @@
 #		wchar_t (port uses "WCHAR_T" extension),
 #		translit (port uses "//TRANSLIT" extension)
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: desktop@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_ICONV_MK)
 _INCLUDE_USES_ICONV_MK=	yes
diff --git a/Mk/Uses/jpeg.mk b/Mk/Uses/jpeg.mk
--- a/Mk/Uses/jpeg.mk
+++ b/Mk/Uses/jpeg.mk
@@ -9,7 +9,7 @@
 #			Valid values: graphics/jpeg-turbo, graphics/mozjpeg
 #			Default value: graphics/jpeg-turbo
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_JPEG_MK)
 
diff --git a/Mk/Uses/libarchive.mk b/Mk/Uses/libarchive.mk
--- a/Mk/Uses/libarchive.mk
+++ b/Mk/Uses/libarchive.mk
@@ -4,7 +4,7 @@
 # Usage:	USES=libarchive
 # Valid ARGS:	none
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_LIBARCHIVE_MK)
 _INCLUDE_USES_LIBARCHIVE_MK=	yes
diff --git a/Mk/Uses/libedit.mk b/Mk/Uses/libedit.mk
--- a/Mk/Uses/libedit.mk
+++ b/Mk/Uses/libedit.mk
@@ -4,7 +4,7 @@
 # Usage:	USES=libedit
 # Valid ARGS:	none
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_LIBEDIT_MK)
 _INCLUDE_USES_LIBEDIT_MK=	yes
diff --git a/Mk/Uses/localbase.mk b/Mk/Uses/localbase.mk
--- a/Mk/Uses/localbase.mk
+++ b/Mk/Uses/localbase.mk
@@ -4,7 +4,7 @@
 # Usage:	USES=localbase or USES=localbase:args
 # Valid ARGS:	ldflags		Set LDFLAGS instead of LIBS
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_LOCALBASE_MK)
 _INCLUDE_USES_LOCALBASE_MK=	yes
diff --git a/Mk/Uses/makeinfo.mk b/Mk/Uses/makeinfo.mk
--- a/Mk/Uses/makeinfo.mk
+++ b/Mk/Uses/makeinfo.mk
@@ -4,7 +4,7 @@
 # Usage:	USES=makeinfo
 # Valid ARGS:	none
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_MAKEINFO_MK)
 _INCLUDE_USES_MAKEINFO_MK=	yes
diff --git a/Mk/Uses/makeself.mk b/Mk/Uses/makeself.mk
--- a/Mk/Uses/makeself.mk
+++ b/Mk/Uses/makeself.mk
@@ -3,7 +3,7 @@
 # Feature:	makeself
 # Usage:	USES=makeself
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_MAKESELF_Mk)
 _INCLUDE_USES_MAKESELF_MK=	yes
diff --git a/Mk/Uses/motif.mk b/Mk/Uses/motif.mk
--- a/Mk/Uses/motif.mk
+++ b/Mk/Uses/motif.mk
@@ -6,7 +6,7 @@
 # If WANT_LESSTIF is defined in user make.conf then lesstif will be used
 # instead of open-motif
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_MOTIF_MK)
 _INCLUDE_USES_MOTIF_MK=	yes
diff --git a/Mk/Uses/ncurses.mk b/Mk/Uses/ncurses.mk
--- a/Mk/Uses/ncurses.mk
+++ b/Mk/Uses/ncurses.mk
@@ -19,7 +19,7 @@
 # BUILD_DEPENDS		- are added if needed
 # RUN_DEPENDS		- are added if needed
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_NCURSES_MK)
 _INCLUDE_USES_NCURSES_MK=	yes
diff --git a/Mk/Uses/ninja.mk b/Mk/Uses/ninja.mk
--- a/Mk/Uses/ninja.mk
+++ b/Mk/Uses/ninja.mk
@@ -8,7 +8,7 @@
 # make			use ninja for the build instead of make, implies "build"
 # run			add a run dependency on ninja
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_NINJA_MK)
 _INCLUDE_USES_NINJA_MK=	yes
diff --git a/Mk/Uses/openal.mk b/Mk/Uses/openal.mk
--- a/Mk/Uses/openal.mk
+++ b/Mk/Uses/openal.mk
@@ -4,7 +4,7 @@
 # Usage:	USES=openal or USES=openal:ARGS
 # Valid ARGS:	al, soft (default), alut
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_OPENAL_MK)
 _INCLUDE_USES_OPENAL_MK=	yes
diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk
--- a/Mk/Uses/pathfix.mk
+++ b/Mk/Uses/pathfix.mk
@@ -5,7 +5,7 @@
 # Usage:	USES=pathfix
 # Valid ARGS:	does not require args
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PATHFIX_MK)
 _INCLUDE_USES_PATHFIX_MK=	yes
diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk
--- a/Mk/Uses/pear.mk
+++ b/Mk/Uses/pear.mk
@@ -7,7 +7,7 @@
 #	- env : Only provide the environment variables, no fetch/build/install
 #		targets.
 #
-# MAINTAINER=	portmgr@FreeBSD.org
+# MAINTAINER=	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PEAR_MK)
 _INCLUDE_USES_PEAR_MK=	yes
diff --git a/Mk/Uses/pkgconfig.mk b/Mk/Uses/pkgconfig.mk
--- a/Mk/Uses/pkgconfig.mk
+++ b/Mk/Uses/pkgconfig.mk
@@ -4,7 +4,7 @@
 # Usage:	USES=pkgconfig or USES=pkgconfig:ARGS
 # Valid ARGS:	build (default, implicit), run, both
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PKGCONFIG_MK)
 _INCLUDE_USES_PKGCONFIG_MK=	yes
diff --git a/Mk/Uses/readline.mk b/Mk/Uses/readline.mk
--- a/Mk/Uses/readline.mk
+++ b/Mk/Uses/readline.mk
@@ -3,7 +3,7 @@
 # Feature:	readline
 # Usage:	USES=readline
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_READLINE_MK)
 _INCLUDE_USES_READLINE_MK=	yes
diff --git a/Mk/Uses/shebangfix.mk b/Mk/Uses/shebangfix.mk
--- a/Mk/Uses/shebangfix.mk
+++ b/Mk/Uses/shebangfix.mk
@@ -31,7 +31,7 @@
 #
 #   perl_CMD=	${SETENV} perl
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_SHEBANGFIX_MK)
 _INCLUDE_USES_SHEBANGFIX_MK=	yes
diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
--- a/Mk/Uses/ssl.mk
+++ b/Mk/Uses/ssl.mk
@@ -21,7 +21,7 @@
 # BUILD_DEPENDS		- are added if needed
 # RUN_DEPENDS		- are added if needed
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 #
 .if !defined(_INCLUDE_USES_SSL_MK)
 _INCLUDE_USES_SSL_MK=	yes
diff --git a/Mk/Uses/tar.mk b/Mk/Uses/tar.mk
--- a/Mk/Uses/tar.mk
+++ b/Mk/Uses/tar.mk
@@ -3,7 +3,7 @@
 # Feature:	tar
 # Usage:	USES=tar[:[xz|lz|lzma|txz|bz[ip]2|tgz|tbz|tbz2|Z]]
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_TAR_MK)
 _INCLUDE_USES_TAR_MK=	yes
diff --git a/Mk/Uses/trigger.mk b/Mk/Uses/trigger.mk
--- a/Mk/Uses/trigger.mk
+++ b/Mk/Uses/trigger.mk
@@ -5,7 +5,7 @@
 # Variables:
 # TRIGGERS: list of triggers to package
 #
-# MAINTAINER= portmgr@FreeBSD.org
+# MAINTAINER= ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_TRIGGER_MK)
 _INCLUDE_USES_TRIGGER_MK=	yes
diff --git a/Mk/Uses/uniquefiles.mk b/Mk/Uses/uniquefiles.mk
--- a/Mk/Uses/uniquefiles.mk
+++ b/Mk/Uses/uniquefiles.mk
@@ -70,7 +70,7 @@
 # NOTE:	multiple logical instances are not supported by pkg and the original
 # pkg_tools at the moment.
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_UNIQUEFILES_MK)
 _INCLUDE_USES_UNIQUEFILES_MK=	yes
diff --git a/Mk/Uses/zip.mk b/Mk/Uses/zip.mk
--- a/Mk/Uses/zip.mk
+++ b/Mk/Uses/zip.mk
@@ -3,7 +3,7 @@
 # Feature:	zip
 # Usage:	USES=zip[:infozip]
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_ZIP_MK)
 _INCLUDE_USES_ZIP_MK=	yes