diff --git a/devel/p5-AnyEvent-I3/Makefile b/devel/p5-AnyEvent-I3/Makefile
index d7353efb53c9..6cb9a13402a6 100644
--- a/devel/p5-AnyEvent-I3/Makefile
+++ b/devel/p5-AnyEvent-I3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-AnyEvent-I3
-# Date created:	   26 Aug 2011
-# Whom:		   Aldis Berjoza <aldis@bsdroot.lv>
-#
+# Created by: Aldis Berjoza <aldis@bsdroot.lv>
 # $FreeBSD$
-#
 
 PORTNAME=	AnyEvent-I3
 PORTVERSION=	0.09
@@ -11,7 +7,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	graudeejs@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Communicate with the i3 window manager
 
 BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
diff --git a/devel/py-mercurialserver/Makefile b/devel/py-mercurialserver/Makefile
index f50d4205fe5d..fce58f29cfaa 100644
--- a/devel/py-mercurialserver/Makefile
+++ b/devel/py-mercurialserver/Makefile
@@ -1,9 +1,5 @@
-# New ports collection Makefile for:	mercurialserver
-# Date Created:				12 Sep 2010
-# Whom:					Aldis Berjoza <aldis@bsdroot.lv>
-#
+# Created by: Aldis Berjoza <aldis@bsdroot.lv>
 # $FreeBSD$
-#
 
 PORTNAME=	mercurialserver
 PORTVERSION=	1.2.0
@@ -12,7 +8,7 @@ MASTER_SITES=	http://dev.lshift.net/paul/mercurial-server/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${SNAME}_${SVERSION}
 
-MAINTAINER=	graudeejs@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Software for hosting mercurial repositories
 
 LICENSE=	GPLv2
diff --git a/java/eclipse-cdt/Makefile b/java/eclipse-cdt/Makefile
index cdacb793c7f2..4beb34922475 100644
--- a/java/eclipse-cdt/Makefile
+++ b/java/eclipse-cdt/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    eclipse-cdt
-# Date created:                         March 1, 2004
-# Whom:                                 gldisater@gldis.ca
-#
+# Created by: gldisater@gldis.ca
 # $FreeBSD$
-#
 
 PORTNAME=	${PLUGIN}
 PORTVERSION=	6.0.2
@@ -14,7 +10,7 @@ MASTER_SITE_SUBDIR=tools/${PLUGIN}/releases/${ECLIPSE_CODENAME}/dist
 DISTNAME=	${PLUGIN}-master-${PORTVERSION}
 PKGNAMEPREFIX=	eclipse-
 
-MAINTAINER=	graudeejs@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C/C++ plugin for Eclipse IDE
 
 RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse
diff --git a/www/sbox-dtc/Makefile b/www/sbox-dtc/Makefile
index 5edb6cf3650d..898277ab202a 100644
--- a/www/sbox-dtc/Makefile
+++ b/www/sbox-dtc/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:        dtc
-# Date created:                 12 January 2005
-# Whom:                         Thomas Goirand
-#
+# Created by: Thomas Goirand
 # $FreeBSD$
-#
 
 PORTNAME=	sbox
 PORTVERSION=	1.10
@@ -11,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://files.bsdroot.lv/my/FreeBSD/distfiles/
 
-MAINTAINER=	graudeejs@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A CGI wrapper for Web site hosting services to safely grant CGI
 
 SBOX_UIDMIN?=	1000