diff --git a/games/holotz-castle/Makefile b/games/holotz-castle/Makefile
index 50cd24ced347..a59b4f5f7c81 100644
--- a/games/holotz-castle/Makefile
+++ b/games/holotz-castle/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: holotzcastle
-# Date created:        4 January 2006
-# Whom:                Pierre-Paul Lavoie <ppl@nbnet.nb.ca>
-#
+# Created by: Pierre-Paul Lavoie <ppl@nbnet.nb.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	holotz-castle
 PORTVERSION=	1.3.13
@@ -12,7 +8,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.mainreactor.net/holotzcastle/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	ppl@nbnet.nb.ca
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A platform game with high doses of mystery
 
 MAKE_ARGS=	HC_BASE=${PREFIX}/share/${PORTNAME}/ HC_BIN_DIR=${PREFIX}/bin/
diff --git a/math/mbasecalc/Makefile b/math/mbasecalc/Makefile
index b365ba121ee3..3e0a0d321ea2 100644
--- a/math/mbasecalc/Makefile
+++ b/math/mbasecalc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mbasecalc
-# Date created:				15 June 2004
-# Whom:					Pierre-Paul Lavoie <ppl@nbnet.nb.ca>
-#
+# Created by: Pierre-Paul Lavoie <ppl@nbnet.nb.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	mbasecalc
 PORTVERSION=	1.1
@@ -12,7 +8,7 @@ CATEGORIES=	math
 MASTER_SITES=	http://www.muquit.com/muquit/software/mbasecalc/
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	ppl@nbnet.nb.ca
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple calculator program inspired by basecalc
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
diff --git a/x11-wm/weewm/Makefile b/x11-wm/weewm/Makefile
index de3e7232fcfb..9d74cbb66c3f 100644
--- a/x11-wm/weewm/Makefile
+++ b/x11-wm/weewm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: weewm
-# Date created:        15 May 2003
-# Whom:                Pierre-Paul Lavoie <ppl@nbnet.nb.ca>
-#
+# Created by: Pierre-Paul Lavoie <ppl@nbnet.nb.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	weewm
 PORTVERSION=	0.0.2
@@ -12,7 +8,7 @@ PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://weewm.flashtux.org/download/
 
-MAINTAINER=	ppl@nbnet.nb.ca
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast and ultra light windowmanager with total keyboard control
 
 PLIST_FILES=	bin/weewm
diff --git a/x11-wm/windowlab/Makefile b/x11-wm/windowlab/Makefile
index 5f099e6dd4f6..e37b3961b570 100644
--- a/x11-wm/windowlab/Makefile
+++ b/x11-wm/windowlab/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: windowlab
-# Date created:        19 April 2003
-# Whom:                Pierre-Paul Lavoie <ppl@nbnet.nb.ca>
-#
+# Created by: Pierre-Paul Lavoie <ppl@nbnet.nb.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	windowlab
 PORTVERSION=	1.40
@@ -11,7 +7,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://nickgravgaard.com/windowlab/
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	ppl@nbnet.nb.ca
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small window manager for X11
 
 MAN1=		windowlab.1x