Index: awscli/Makefile
===================================================================
--- awscli/Makefile
+++ awscli/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 
-MAINTAINER=	bradleythughes@fastmail.fm
+MAINTAINER=	bhughes@FreeBSD.org
 COMMENT=	Universal Command Line Interface for Amazon Web Services
 
 LICENSE=	APACHE20
Index: node/Makefile
===================================================================
--- node/Makefile
+++ node/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 
-MAINTAINER=	bradleythughes@fastmail.fm
+MAINTAINER=	bhughes@FreeBSD.org
 COMMENT=	V8 JavaScript for client and server (7.x)
 
 LICENSE=	MIT
Index: node4/Makefile
===================================================================
--- node4/Makefile
+++ node4/Makefile
@@ -8,7 +8,7 @@
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	4
 
-MAINTAINER=	bradleythughes@fastmail.fm
+MAINTAINER=	bhughes@FreeBSD.org
 COMMENT=	V8 JavaScript for client and server (4.x LTS)
 
 LICENSE=	MIT
Index: node6/Makefile
===================================================================
--- node6/Makefile
+++ node6/Makefile
@@ -7,7 +7,7 @@
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	6
 
-MAINTAINER=	bradleythughes@fastmail.fm
+MAINTAINER=	bhughes@FreeBSD.org
 COMMENT=	V8 JavaScript for client and server (6.x)
 
 LICENSE=	MIT
Index: py-botocore/Makefile
===================================================================
--- py-botocore/Makefile
+++ py-botocore/Makefile
@@ -7,7 +7,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	bradleythughes@fastmail.fm
+MAINTAINER=	bhughes@FreeBSD.org
 COMMENT=	Low-level, core functionality of boto 3
 
 LICENSE=	APACHE20
Index: py-s3transfer/Makefile
===================================================================
--- py-s3transfer/Makefile
+++ py-s3transfer/Makefile
@@ -6,7 +6,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	bradleythughes@fastmail.fm
+MAINTAINER=	bhughes@FreeBSD.org
 COMMENT=	Amazon S3 Transfer Manager for Python
 
 LICENSE=	APACHE20
Index: turnserver/Makefile
===================================================================
--- turnserver/Makefile
+++ turnserver/Makefile
@@ -11,7 +11,7 @@
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:prog \
 		turn.extra.docs-2.0.0.1.tar.gz:xdocs
 
-MAINTAINER=	bradleythughes@fastmail.fm
+MAINTAINER=	bhughes@FreeBSD.org
 COMMENT=	STUN/TURN Server; IPv6, DTLS support; RFCs 5389, 5766, 6062, 6156
 
 LICENSE=	BSD3CLAUSE