Index: head/audio/pianobar/Makefile
===================================================================
--- head/audio/pianobar/Makefile
+++ head/audio/pianobar/Makefile
@@ -10,7 +10,7 @@
 PATCH_SITES=	https://github.com/PromyLOPh/${PORTNAME}/commit/
 PATCHFILES=	38b16f9957a7.patch:-p1
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Command-line Pandora online radio player
 
 LICENSE=	MIT
Index: head/audio/pithos/Makefile
===================================================================
--- head/audio/pithos/Makefile
+++ head/audio/pithos/Makefile
@@ -6,7 +6,7 @@
 PORTREVISION=	2
 CATEGORIES=	audio
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Pandora client for the GNOME desktop
 
 LICENSE=	GPLv3
Index: head/devel/py-minio/Makefile
===================================================================
--- head/devel/py-minio/Makefile
+++ head/devel/py-minio/Makefile
@@ -6,7 +6,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Minio library for Amazon S3 compatible cloud storage
 
 LICENSE=	APACHE20
Index: head/net/libstorj/Makefile
===================================================================
--- head/net/libstorj/Makefile
+++ head/net/libstorj/Makefile
@@ -5,7 +5,7 @@
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	C library and CLI for encrypted file transfer on the Storj network
 
 LICENSE=	LGPL21+
Index: head/net/nsq/Makefile
===================================================================
--- head/net/nsq/Makefile
+++ head/net/nsq/Makefile
@@ -6,7 +6,7 @@
 DISTVERSIONSUFFIX=	-compat
 CATEGORIES=	net
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Realtime distributed messaging platform
 
 LICENSE=	MIT
Index: head/net/py-libstorj/Makefile
===================================================================
--- head/net/py-libstorj/Makefile
+++ head/net/py-libstorj/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	net
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Python bindings for libstorj
 
 LICENSE=	LGPL21+
Index: head/net/py-zeroconf/Makefile
===================================================================
--- head/net/py-zeroconf/Makefile
+++ head/net/py-zeroconf/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Pure python implementation of multicast DNS service discovery
 
 LICENSE=	LGPL21+
Index: head/security/ngrok/Makefile
===================================================================
--- head/security/ngrok/Makefile
+++ head/security/ngrok/Makefile
@@ -8,7 +8,7 @@
 DISTNAME=	${PORTNAME}-stable-freebsd-${ARCH:S/i386/386/:S/x86_64/amd64/}
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Secure tunnels to localhost
 
 # run 'ngrok credits' for details
Index: head/sysutils/consul-alerts/Makefile
===================================================================
--- head/sysutils/consul-alerts/Makefile
+++ head/sysutils/consul-alerts/Makefile
@@ -5,7 +5,7 @@
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Simple daemon to send notifications based on Consul health checks
 
 LICENSE=	GPLv2+
Index: head/sysutils/consul-replicate/Makefile
===================================================================
--- head/sysutils/consul-replicate/Makefile
+++ head/sysutils/consul-replicate/Makefile
@@ -5,7 +5,7 @@
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Consul cross-DC KV replication daemon
 
 LICENSE=	MPL20
Index: head/sysutils/ipfs-go/Makefile
===================================================================
--- head/sysutils/ipfs-go/Makefile
+++ head/sysutils/ipfs-go/Makefile
@@ -9,7 +9,7 @@
 PKGNAMESUFFIX=	-go
 DISTNAME=	go-ipfs_${DISTVERSIONPREFIX}${DISTVERSION}_freebsd-${ARCH}
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	IPFS implementation in Go
 
 LICENSE=	MIT
Index: head/sysutils/mtpfs/Makefile
===================================================================
--- head/sysutils/mtpfs/Makefile
+++ head/sysutils/mtpfs/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.adebenham.com/files/mtp/
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	MTP device filesystem
 
 LICENSE=	GPLv3
Index: head/sysutils/nomad/Makefile
===================================================================
--- head/sysutils/nomad/Makefile
+++ head/sysutils/nomad/Makefile
@@ -5,7 +5,7 @@
 DISTVERSION=	0.8.4
 CATEGORIES=	sysutils
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Cluster manager and scheduler
 
 LICENSE=	MPL20
Index: head/sysutils/py-consul/Makefile
===================================================================
--- head/sysutils/py-consul/Makefile
+++ head/sysutils/py-consul/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Python client for consul
 
 LICENSE=	MIT
Index: head/sysutils/py-nomad/Makefile
===================================================================
--- head/sysutils/py-nomad/Makefile
+++ head/sysutils/py-nomad/Makefile
@@ -5,7 +5,7 @@
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Python client for nomad
 
 LICENSE=	MIT
Index: head/www/grafana3/Makefile
===================================================================
--- head/www/grafana3/Makefile
+++ head/www/grafana3/Makefile
@@ -7,7 +7,7 @@
 PKGNAMESUFFIX=	3
 CATEGORIES=	www
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Dashboard and graph editor for Graphite, InfluxDB & OpenTSDB
 
 LICENSE=	APACHE20
Index: head/www/minio-client/Makefile
===================================================================
--- head/www/minio-client/Makefile
+++ head/www/minio-client/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	${GH_TAGNAME:S/RELEASE.//:S/Z//:S/T/-/:S/-/./g}
 CATEGORIES=	www
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Replacement for ls, cp, mkdir, diff and rsync commands for filesystems
 
 LICENSE=	APACHE20
Index: head/www/py-django-json-rpc/Makefile
===================================================================
--- head/www/py-django-json-rpc/Makefile
+++ head/www/py-django-json-rpc/Makefile
@@ -8,7 +8,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Simple JSON-RPC implementation for Django
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${PY_FLAVOR}
Index: head/www/py-django-simple-captcha/Makefile
===================================================================
--- head/www/py-django-simple-captcha/Makefile
+++ head/www/py-django-simple-captcha/Makefile
@@ -7,7 +7,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Simple, yet powerful, Django captcha application
 
 LICENSE=	MIT
Index: head/www/py-djangotoolbox/Makefile
===================================================================
--- head/www/py-djangotoolbox/Makefile
+++ head/www/py-djangotoolbox/Makefile
@@ -8,7 +8,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	jhixson@gmail.com
+MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Common API for running Django on non-relational/NoSQL databases
 
 LICENSE=	BSD3CLAUSE