Index: head/audio/ctronome/Makefile
===================================================================
--- head/audio/ctronome/Makefile
+++ head/audio/ctronome/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	audio
 MASTER_SITES=	http://ctronome.kign.org/source/
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Programmable console-based metronome
 
 LICENSE=	GPLv2
Index: head/benchmarks/nbench/Makefile
===================================================================
--- head/benchmarks/nbench/Makefile
+++ head/benchmarks/nbench/Makefile
@@ -7,7 +7,7 @@
 MASTER_SITES=	http://www.tux.org/~mayer/linux/
 DISTNAME=	${PORTNAME}-byte-${PORTVERSION}
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	BYTE Magazine's native benchmarks
 
 ALL_TARGET=	# empty
Index: head/benchmarks/phoronix-test-suite/Makefile
===================================================================
--- head/benchmarks/phoronix-test-suite/Makefile
+++ head/benchmarks/phoronix-test-suite/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.phoronix-test-suite.com/releases/
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Phoronix Benchmarking Suite
 
 LICENSE=	GPLv3
Index: head/benchmarks/stress-ng/Makefile
===================================================================
--- head/benchmarks/stress-ng/Makefile
+++ head/benchmarks/stress-ng/Makefile
@@ -5,7 +5,7 @@
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://kernel.ubuntu.com/~cking/tarballs/stress-ng/
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Stress test benchmarks
 
 LICENSE=	GPLv2+
Index: head/devel/babeltrace/Makefile
===================================================================
--- head/devel/babeltrace/Makefile
+++ head/devel/babeltrace/Makefile
@@ -5,7 +5,7 @@
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Tool and library to read, write and convert execution traces
 
 # license is complicated
Index: head/devel/breakpad/Makefile
===================================================================
--- head/devel/breakpad/Makefile
+++ head/devel/breakpad/Makefile
@@ -5,7 +5,7 @@
 DISTVERSION=	g20170811
 CATEGORIES=	devel
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Client/server based crash-reporting system
 
 LICENSE=	BSD3CLAUSE
Index: head/devel/cccc/Makefile
===================================================================
--- head/devel/cccc/Makefile
+++ head/devel/cccc/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	devel textproc www
 MASTER_SITES=	SF
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	C and C++ Code Counter
 
 LICENSE=	GPLv2+
Index: head/devel/chromium-gn/Makefile
===================================================================
--- head/devel/chromium-gn/Makefile
+++ head/devel/chromium-gn/Makefile
@@ -3,7 +3,7 @@
 CATEGORIES=	devel www
 PKGNAMESUFFIX=	-gn
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Gn meta build framework
 
 MASTERDIR=	${.CURDIR}/../../www/chromium
Index: head/devel/gdb/Makefile
===================================================================
--- head/devel/gdb/Makefile
+++ head/devel/gdb/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	GNU GDB of newer version than comes with the system
 
 LICENSE=	GPLv3
Index: head/devel/hs-ShellCheck/Makefile
===================================================================
--- head/devel/hs-ShellCheck/Makefile
+++ head/devel/hs-ShellCheck/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	0.4.6
 CATEGORIES=	devel haskell
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Shell script analysis tool
 
 LICENSE=	GPLv3
Index: head/devel/papi/Makefile
===================================================================
--- head/devel/papi/Makefile
+++ head/devel/papi/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	devel
 MASTER_SITES=	http://icl.cs.utk.edu/projects/papi/downloads/
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	API to access the performance counter hw in the microprocessor
 
 LICENSE=	BSD3CLAUSE
Index: head/math/ndiff/Makefile
===================================================================
--- head/math/ndiff/Makefile
+++ head/math/ndiff/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.math.utah.edu/pub/misc/
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Compare files, ignoring numeric differences
 
 LICENSE=	GPLv2
Index: head/net/librdkafka/Makefile
===================================================================
--- head/net/librdkafka/Makefile
+++ head/net/librdkafka/Makefile
@@ -6,7 +6,7 @@
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Apache Kafka C/C++ library
 
 LICENSE=	BSD2CLAUSE
Index: head/sysutils/bstack/Makefile
===================================================================
--- head/sysutils/bstack/Makefile
+++ head/sysutils/bstack/Makefile
@@ -5,7 +5,7 @@
 PORTREVISION=	1
 CATEGORIES=	sysutils
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Debug tool that shows the stack trace of a running process
 
 LICENSE=	BSD3CLAUSE
Index: head/sysutils/pstack/Makefile
===================================================================
--- head/sysutils/pstack/Makefile
+++ head/sysutils/pstack/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	1.3
 CATEGORIES=	sysutils
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Retrieve process/core file stack traces
 
 LICENSE=	BSD2CLAUSE
Index: head/sysutils/pstacku/Makefile
===================================================================
--- head/sysutils/pstacku/Makefile
+++ head/sysutils/pstacku/Makefile
@@ -7,7 +7,7 @@
 MASTER_SITES=	https://kib.kiev.ua/kib/${PORTNAME}/ \
 		http://kib.kiev.ua/kib/${PORTNAME}/
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Retrieve process stack traces
 
 LICENSE=	BSD2CLAUSE
Index: head/textproc/kdiff3/Makefile
===================================================================
--- head/textproc/kdiff3/Makefile
+++ head/textproc/kdiff3/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	textproc kde
 MASTER_SITES=	SF
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	KDE4 graphical frontend for diff
 
 LICENSE=	GPLv2
Index: head/www/yarn/Makefile
===================================================================
--- head/www/yarn/Makefile
+++ head/www/yarn/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	www
 MASTER_SITES=	https://yarnpkg.com/downloads/${PORTVERSION}/
 
-MAINTAINER=	luca.pizzamiglio@gmail.com
+MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Package manager for node, alternative to npm
 
 LICENSE=	BSD2CLAUSE