Index: databases/influxdb/Makefile
===================================================================
--- databases/influxdb/Makefile
+++ databases/influxdb/Makefile
@@ -3,7 +3,7 @@
 DISTVERSION=	1.8.10
 CATEGORIES=	databases net-mgmt
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Open-source distributed time series database
 
 LICENSE=	MIT
Index: devel/ghq/Makefile
===================================================================
--- devel/ghq/Makefile
+++ devel/ghq/Makefile
@@ -3,7 +3,7 @@
 DISTVERSION=	1.2.1
 CATEGORIES=	devel
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Repository management tool (Git, Hg, SVN, Fossil, Bazaar, Darcs)
 
 LICENSE=	MIT
Index: devel/upnp/Makefile
===================================================================
--- devel/upnp/Makefile
+++ devel/upnp/Makefile
@@ -6,7 +6,7 @@
 PORTEPOCH=	1
 CATEGORIES=	devel
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Universal Plug and Play Software Development Kit
 
 LICENSE=	BSD3CLAUSE
Index: irc/inspircd/Makefile
===================================================================
--- irc/inspircd/Makefile
+++ irc/inspircd/Makefile
@@ -5,7 +5,7 @@
 DISTVERSION=	3.11.0
 CATEGORIES=	irc
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Modular C++ IRC daemon
 
 LICENSE=	GPLv2
Index: multimedia/emby-server/Makefile
===================================================================
--- multimedia/emby-server/Makefile
+++ multimedia/emby-server/Makefile
@@ -13,7 +13,7 @@
 EXTRACT_ONLY=	${DISTNAME}.zip ffdetect-${FFVERSION}-x64_freebsd12.tar.xz \
 		ffmpeg-${FFVERSION}.tar.gz
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Media server to organize, play & stream audio/video to various devices
 
 LICENSE=	UNKNOWN
Index: multimedia/librespot/Makefile
===================================================================
--- multimedia/librespot/Makefile
+++ multimedia/librespot/Makefile
@@ -4,7 +4,7 @@
 PORTREVISION=	1
 CATEGORIES=	multimedia
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Open Source Spotify client library
 
 LICENSE=	MIT
Index: net-mgmt/librenms/files/librenms.in
===================================================================
--- net-mgmt/librenms/files/librenms.in
+++ net-mgmt/librenms/files/librenms.in
@@ -17,8 +17,6 @@
 #			Default /var/run/librenms/librenms.pid
 # librenms_daemonflags:	Flags passed to daemon(8), overwrite this to use eg syslog 
 # 			Default "-o /var/log/librenms/librenms-service.log"
-#
-# Contributed by: Dries Michiels (driesm.michiels@gmail.com)
 
 . /etc/rc.subr
 
Index: net-mgmt/netdata-go/Makefile
===================================================================
--- net-mgmt/netdata-go/Makefile
+++ net-mgmt/netdata-go/Makefile
@@ -3,7 +3,7 @@
 DISTVERSION=	0.30.0
 CATEGORIES=	net-mgmt
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	External netdata collection plugin written in Go
 
 LICENSE=	GPLv3
Index: net/dhcpcd-ui/Makefile
===================================================================
--- net/dhcpcd-ui/Makefile
+++ net/dhcpcd-ui/Makefile
@@ -4,7 +4,7 @@
 MASTER_SITES=	https://roy.marples.name/downloads/dhcpcd/ \
 		https://cflags.cc/roy/dhcpcd/
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	GTK+ / Curses interface to dhcpcd
 
 LICENSE=	BSD2CLAUSE
Index: net/dhcpcd/Makefile
===================================================================
--- net/dhcpcd/Makefile
+++ net/dhcpcd/Makefile
@@ -5,7 +5,7 @@
 CATEGORIES=	net
 MASTER_SITES=	https://roy.marples.name/downloads/dhcpcd/
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	DHCP/IPv4LL/IPv6RS/DHCPv6 client
 
 LICENSE=	BSD2CLAUSE
Index: net/librespeed-cli/Makefile
===================================================================
--- net/librespeed-cli/Makefile
+++ net/librespeed-cli/Makefile
@@ -3,7 +3,7 @@
 DISTVERSION=	1.0.9
 CATEGORIES=	net www
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	CLI interface to run librespeed speedtests
 
 LICENSE=	LGPL3
Index: net/librespeed-go/Makefile
===================================================================
--- net/librespeed-go/Makefile
+++ net/librespeed-go/Makefile
@@ -3,7 +3,7 @@
 DISTVERSION=	1.1.4
 CATEGORIES=	net www
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	GO backend for LibreSpeed
 
 LICENSE=	LGPL3
Index: net/rclone-browser/Makefile
===================================================================
--- net/rclone-browser/Makefile
+++ net/rclone-browser/Makefile
@@ -2,7 +2,7 @@
 DISTVERSION=	1.8.0
 CATEGORIES=	net
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Simple cross platform GUI for rclone
 
 LICENSE=	MIT
Index: security/pam_google_authenticator/Makefile
===================================================================
--- security/pam_google_authenticator/Makefile
+++ security/pam_google_authenticator/Makefile
@@ -5,7 +5,7 @@
 PORTEPOCH=	1
 CATEGORIES=	security
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	PAM module for two-step authentication from Google
 
 LICENSE=	APACHE20
Index: security/py-vici/Makefile
===================================================================
--- security/py-vici/Makefile
+++ security/py-vici/Makefile
@@ -4,7 +4,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Native Python interface for strongSwan's VICI protocol
 
 LICENSE=	MIT
Index: sysutils/bfs/Makefile
===================================================================
--- sysutils/bfs/Makefile
+++ sysutils/bfs/Makefile
@@ -2,7 +2,7 @@
 DISTVERSION=	2.2.1
 CATEGORIES=	sysutils
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Breadth-first version of the UNIX find command
 
 LICENSE=	BSD0CLAUSE
Index: sysutils/py-pyznap/Makefile
===================================================================
--- sysutils/py-pyznap/Makefile
+++ sysutils/py-pyznap/Makefile
@@ -4,7 +4,7 @@
 MASTER_SITES=		CHEESESHOP
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	ZFS snapshot tool written in Python
 
 LICENSE=	GPLv3
Index: sysutils/py-scarab/Makefile
===================================================================
--- sysutils/py-scarab/Makefile
+++ sysutils/py-scarab/Makefile
@@ -4,7 +4,7 @@
 CATEGORIES=		sysutils python
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	CLI interface for FreeBSD Bugzilla
 
 LICENSE=	BSD3CLAUSE
Index: sysutils/stalepid/Makefile
===================================================================
--- sysutils/stalepid/Makefile
+++ sysutils/stalepid/Makefile
@@ -5,7 +5,7 @@
 CATEGORIES=	sysutils
 MASTER_SITES=	https://devel.ringlet.net/files/sys/stalepid/
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Check for stale pid files and remove them
 
 LICENSE=	BSD2CLAUSE
Index: www/librespeed/Makefile
===================================================================
--- www/librespeed/Makefile
+++ www/librespeed/Makefile
@@ -4,7 +4,7 @@
 CATEGORIES=	www net
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Lightweight selfhosted speedtest
 
 LICENSE=	LGPL3