diff --git a/mail/mailman3/Makefile b/mail/mailman3/Makefile
index cce10cbc780a..3c31f2def4d0 100644
--- a/mail/mailman3/Makefile
+++ b/mail/mailman3/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	mailman
 PORTVERSION=	3.3.1
 CATEGORIES=	mail
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	vishwin@vishwin.info
+MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	GNU Mailing List Management System, Core
 
 LICENSE=	GPLv3+
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiosmtpd>=1.1:mail/py-aiosmtpd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}alembic>0:databases/py-alembic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}atpublic>0:devel/py-atpublic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=1.14.0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}falcon>=1.0.0.rc1:www/py-falcon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flufl.bounce>0:mail/py-flufl.bounce@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flufl.i18n>=2.0:devel/py-flufl.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flufl.lock>=3.1:devel/py-flufl.lock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lazr.config>0:devel/py-lazr.config@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>1.2.3:databases/py-sqlalchemy12@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.configuration>0:devel/py-zope.configuration@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.event>0:devel/py-zope.event@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 USE_RC_SUBR=	mailman
 
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
 USERS=		mailman
 GROUPS=		mailman
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-python-pam/Makefile b/security/py-python-pam/Makefile
index a8b1cd25185f..2cd10cb9bfe6 100644
--- a/security/py-python-pam/Makefile
+++ b/security/py-python-pam/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	python-pam
 DISTVERSION=	1.8.4
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	vishwin@vishwin.info
+MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Python PAM module
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/oxygen-fonts/Makefile b/x11-fonts/oxygen-fonts/Makefile
index 87aefff03b9e..6fa5741a2910 100644
--- a/x11-fonts/oxygen-fonts/Makefile
+++ b/x11-fonts/oxygen-fonts/Makefile
@@ -1,26 +1,26 @@
 PKGNAMEPREFIX=	
 PORTNAME=	oxygen-fonts
 DISTVERSION=	5.4.3
 CATEGORIES=	x11-fonts kde-plasma
 
-MAINTAINER=	vishwin@vishwin.info
+MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Plasma5 Oxygen font family
 
 LICENSE=	OFL11 GPLv3RLE+
 LICENSE_COMB=	dual
 LICENSE_FILE_OFL11=	${WRKSRC}/COPYING-OFL
 LICENSE_FILE_GPLv3RLE+ =	${WRKSRC}/COPYING-GPL+FE.txt
 
 BUILD_DEPENDS=	fontforge:print/fontforge
 
 USES=	cmake cpe fonts:none kde:5 qt:5 tar:xz
 
 USE_KDE=	ecm_build
 KDE_PLASMA_VERSION=	${DISTVERSION}
 KDE_PLASMA_BRANCH=	Attic
 
 USE_QT=	buildtools_build qmake_build
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>