Index: head/cad/openvsp/Makefile
===================================================================
--- head/cad/openvsp/Makefile
+++ head/cad/openvsp/Makefile
@@ -7,7 +7,7 @@
 DISTVERSIONPREFIX=	${GH_PROJECT}_
 CATEGORIES=	cad
 
-MAINTAINER=	fernando.apesteguia@gmail.com
+MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Create a 3D model of an aircraft defined by engineering parameters
 
 LICENSE=	NOSA13
Index: head/cad/stepcode/Makefile
===================================================================
--- head/cad/stepcode/Makefile
+++ head/cad/stepcode/Makefile
@@ -7,7 +7,7 @@
 PORTREVISION=	3
 CATEGORIES=	cad
 
-MAINTAINER=	fernando.apesteguia@gmail.com
+MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Generates C++ and Python from ISO10303 files
 
 LICENSE=	BSD3CLAUSE
Index: head/devel/cpptest/Makefile
===================================================================
--- head/devel/cpptest/Makefile
+++ head/devel/cpptest/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	fernando.apesteguia@gmail.com
+MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Unit testing framework for handling automated tests in C++
 
 LICENSE=	LGPL3
Index: head/devel/visualparadigm/Makefile
===================================================================
--- head/devel/visualparadigm/Makefile
+++ head/devel/visualparadigm/Makefile
@@ -7,7 +7,7 @@
 MASTER_SITES=	https://eu5.visual-paradigm.com/visual-paradigm/vpce${PORTVERSION:R}/${PORTVERSION:E}/
 DISTNAME=	Visual_Paradigm_CE_${PORTVERSION:C/\./_/g}_Unix_InstallFree
 
-MAINTAINER=	fernando.apesteguia@gmail.com
+MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Visual modeling tool for all kinds of UML diagrams
 
 LICENSE=	VPCEL
Index: head/graphics/code-eli/Makefile
===================================================================
--- head/graphics/code-eli/Makefile
+++ head/graphics/code-eli/Makefile
@@ -6,7 +6,7 @@
 PORTREVISION=	4
 CATEGORIES=	graphics
 
-MAINTAINER=	fernando.apesteguia@gmail.com
+MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Library with functionalities for geometries
 
 LICENSE=	EPL
Index: head/graphics/converseen/Makefile
===================================================================
--- head/graphics/converseen/Makefile
+++ head/graphics/converseen/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Converseen/Converseen%20${PORTVERSION:R:R}/
 
-MAINTAINER=	fernando.apesteguia@gmail.com
+MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Easy to use graphics conversion utility
 
 LICENSE=	GPLv3+
Index: head/graphics/opennurbs/Makefile
===================================================================
--- head/graphics/opennurbs/Makefile
+++ head/graphics/opennurbs/Makefile
@@ -8,7 +8,7 @@
 MASTER_SITES=	http://files.na.mcneel.com/opennurbs/5.0/2013-07-11/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	fernando.apesteguia@gmail.com
+MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Tools to accurately transfer 3-D geometry between applications
 
 LICENSE_FILE=	${WRKSRC}/readme.txt
Index: head/lang/basic256/Makefile
===================================================================
--- head/lang/basic256/Makefile
+++ head/lang/basic256/Makefile
@@ -8,7 +8,7 @@
 MASTER_SITES=	SF/kidbasic/${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
-MAINTAINER=	fernando.apesteguia@gmail.com
+MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Easy to use BASIC language and IDE for education
 
 LICENSE=	GPLv2
Index: head/math/cminpack/Makefile
===================================================================
--- head/math/cminpack/Makefile
+++ head/math/cminpack/Makefile
@@ -6,7 +6,7 @@
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
-MAINTAINER=	fernando.apesteguia@gmail.com
+MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Solving nonlinear equations and nonlinear least squares problems
 
 LICENSE_FILE=	${WRKSRC}/CopyrightMINPACK.txt
Index: head/math/dynare/Makefile
===================================================================
--- head/math/dynare/Makefile
+++ head/math/dynare/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	math
 MASTER_SITES=	http://www.dynare.org/release/source/
 
-MAINTAINER=	fernando.apesteguia@gmail.com
+MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Software platform for handling a wide class of economic models
 
 LICENSE=	GPLv3