diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 81ece37782f8..308a6655aa8c 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	p4
 PORTVERSION=	${YEAR}.${MAJOR}.${MINOR}
 PORTREVISION=	3
 CATEGORIES=	devel
 # Perforce stupidly rerolls their distfiles on a regular basis, updating the
 # files' timestamps when they do, which changes the zip file's checksum.  Work
 # around that by cacheing the distfile in LOCAL and using that version to make
 # distinfo
 MASTER_SITES=	LOCAL/asomers/perforce/p4 \
 		https://swarm.workshop.perforce.com/projects/perforce_software-p4/archives/
 DISTNAME=	${YEAR}-${MAJOR}
 DISTFILES=	${ZIP_FILES}
 DIST_SUBDIR=	perforce/p4
 
-MAINTAINER=	asomers@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perforce client
 WWW=		https://www.perforce.com/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_mips64=	fails to install: /wrkdirs/usr/ports/devel/p4/work/2016-1/p4-bin/p4: No such file or directory
 BROKEN_FreeBSD_12_powerpc64=	fails to build: /bin/sh: clang++: not found
 
 BUILD_DEPENDS=	${JAM}:devel/jam
 
 # p4 links libssl and libcrypto statically, so specify :build
 USES=		ssl:build
 
 PLIST_FILES=	bin/p4
 
 .include <bsd.port.pre.mk>
 
 .include "Makefile.inc"
 
 # Sadly, Jam always returns 1 even on success.  Ignore its return value and
 # detect build errors during the install phase.
 do-build:
 	cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \
 		CCFLAGS="${CFLAGS}" \
 		HDRS="${OPENSSLINC}" \
 		LINKFLAGS="${LDFLAGS}" \
 		OSVER=${OSVER} \
 		SSL="yes" \
 		SSLPREFIX=${OPENSSLLIB} \
 		${JAM} -dx -j${MAKE_JOBS_NUMBER} || true
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/p4-bin/p4 ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4api/Makefile b/devel/p4api/Makefile
index 24993aaf7eb8..690f8f602bca 100644
--- a/devel/p4api/Makefile
+++ b/devel/p4api/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	p4api
 PORTVERSION=	${YEAR}.${MAJOR}.${MINOR}
 PORTREVISION=	1
 CATEGORIES=	devel
 # Perforce stupidly rerolls their distfiles on a regular basis, updating the
 # files' timestamps when they do, which changes the zip file's checksum.  Work
 # around that by cacheing the distfile in LOCAL and using that version to make
 # distinfo
 MASTER_SITES=	LOCAL/asomers/perforce/p4:zip \
 		ftp://ftp.perforce.com/perforce/${P4VERSION}/doc/manuals/p4api/:pdf \
 		https://swarm.workshop.perforce.com/projects/perforce_software-p4/archives/:zip
 DIST_SUBDIR=	perforce/p4
 DISTNAME=	${YEAR}-${MAJOR}
 DISTFILES=	${ZIP_FILES}:zip p4api.pdf:pdf
 EXTRACT_ONLY=	${ZIP_FILES}
 
-MAINTAINER=	asomers@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perforce API (static libraries and header files)
 WWW=		http://www.perforce.com/perforce/loadsupp.html
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_FreeBSD_12_powerpc64=	fails to build: /bin/sh: clang++: not found
 
 BUILD_DEPENDS=	${JAM}:devel/jam
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USES=		zip
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 .include <bsd.port.pre.mk>
 .include "../p4/Makefile.inc"
 
 # Sadly, Jam always returns 1 even on success.  Ignore its return value and
 # detect build errors during the install phase.
 do-build:
 	cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \
 		CCFLAGS="${CFLAGS}" \
 		LINKFLAGS="${LDFLAGS}" \
 		OSVER=${OSVER} \
 		API=1 \
 		TYPE=pic \
 		${JAM} -dx -j${MAKE_JOBS_NUMBER} || true
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/perforce
 	cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/include/p4 && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/perforce
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/perforce
 	cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/perforce
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/p4api.pdf ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/sample && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>