Switch to my @FreeBSD.org address.

Approved by:	ahze (mentor)

83 files changed, 83 insertions, 83 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 701163d11b4b..25f94fd5bbdf 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://opencircuitdesign.com/xcircuit/archive/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	An X11 drawing program [especially for circuit schematics]
 
 BUILD_DEPENDS=	tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${USE_TCL} \
diff --git a/databases/erlang-mysql/Makefile b/databases/erlang-mysql/Makefile
index 84bdfc2472a1..328fcfa0b776 100644
--- a/databases/erlang-mysql/Makefile
+++ b/databases/erlang-mysql/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	https://support.process-one.net/doc/download/attachments/415/ \
 PKGNAMEPREFIX=	erlang-
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Native MySQL driver for Erlang
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
diff --git a/databases/p5-DBD-Google/Makefile b/databases/p5-DBD-Google/Makefile
index eee61516b65c..5290e7c32dcc 100644
--- a/databases/p5-DBD-Google/Makefile
+++ b/databases/p5-DBD-Google/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBD
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Treat Google as a datasource for DBI
 
 BUILD_DEPENDS=	${SITE_PERL}/Net/Google.pm:${PORTSDIR}/net/p5-Net-Google \
diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index 34e8985d856e..3a6ed7abf5f0 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/				\
 		http://ftp.horde.org/pub/kronolith/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Kronolith is the Horde calendar application
 
 RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index 2970eaa54d2c..e4297a73abfc 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/mnemo/				\
 		http://ftp.horde.org/pub/mnemo/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Mnemo is the Horde notes and memos application
 
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index 675c40b80e7b..10329415b122 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -20,7 +20,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/nag/				\
 		http://ftp.horde.org/pub/nag/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Nag is a simple, multiuser task list manager
 
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde4-kronolith/Makefile
index 34e8985d856e..3a6ed7abf5f0 100644
--- a/deskutils/horde4-kronolith/Makefile
+++ b/deskutils/horde4-kronolith/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/				\
 		http://ftp.horde.org/pub/kronolith/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Kronolith is the Horde calendar application
 
 RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/deskutils/horde4-mnemo/Makefile b/deskutils/horde4-mnemo/Makefile
index 2970eaa54d2c..e4297a73abfc 100644
--- a/deskutils/horde4-mnemo/Makefile
+++ b/deskutils/horde4-mnemo/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/mnemo/				\
 		http://ftp.horde.org/pub/mnemo/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Mnemo is the Horde notes and memos application
 
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile
index 675c40b80e7b..10329415b122 100644
--- a/deskutils/horde4-nag/Makefile
+++ b/deskutils/horde4-nag/Makefile
@@ -20,7 +20,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/nag/				\
 		http://ftp.horde.org/pub/nag/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Nag is a simple, multiuser task list manager
 
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/deskutils/kronolith/Makefile b/deskutils/kronolith/Makefile
index 34e8985d856e..3a6ed7abf5f0 100644
--- a/deskutils/kronolith/Makefile
+++ b/deskutils/kronolith/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/				\
 		http://ftp.horde.org/pub/kronolith/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Kronolith is the Horde calendar application
 
 RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/deskutils/mnemo/Makefile b/deskutils/mnemo/Makefile
index 2970eaa54d2c..e4297a73abfc 100644
--- a/deskutils/mnemo/Makefile
+++ b/deskutils/mnemo/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/mnemo/				\
 		http://ftp.horde.org/pub/mnemo/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Mnemo is the Horde notes and memos application
 
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/deskutils/nag/Makefile b/deskutils/nag/Makefile
index 675c40b80e7b..10329415b122 100644
--- a/deskutils/nag/Makefile
+++ b/deskutils/nag/Makefile
@@ -20,7 +20,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/nag/				\
 		http://ftp.horde.org/pub/nag/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Nag is a simple, multiuser task list manager
 
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index f714a76dabd7..b5242521846e 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -12,7 +12,7 @@ CATEGORIES+=	deskutils
 MASTER_SITES=	ftp://plan.ftp.fu-berlin.de/
 MASTER_SITE_SUBDIR=	applications
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	An X/Motif schedule planner with calendar
 
 USE_MOTIF=	yes
diff --git a/deskutils/snotes/Makefile b/deskutils/snotes/Makefile
index 1b1bbab46b23..8b224790d27f 100644
--- a/deskutils/snotes/Makefile
+++ b/deskutils/snotes/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	s-notes
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A lightweight, configurable sticky notes utility
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
diff --git a/deskutils/teapot/Makefile b/deskutils/teapot/Makefile
index cacc17d58922..e3a8955148b0 100644
--- a/deskutils/teapot/Makefile
+++ b/deskutils/teapot/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	deskutils
 MASTER_SITES=	http://www.moria.de/~michael/teapot/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Full-screen curses based spread sheet program
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="" LIBS="-lcurses -lm" \
diff --git a/devel/bin86/Makefile b/devel/bin86/Makefile
index 12a021be6391..4549273405f1 100644
--- a/devel/bin86/Makefile
+++ b/devel/bin86/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://homepage.ntlworld.com/robert.debath/dev86/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	16-bit assembler and loader (conflicts with devel/bcc)
 
 BINS=		as/as86 ld/ld86 ld/objchop ld/catimage ld/objdump86
diff --git a/devel/chora/Makefile b/devel/chora/Makefile
index 76fe46c6334e..0c4ece6cdddf 100644
--- a/devel/chora/Makefile
+++ b/devel/chora/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/chora/				\
 		http://ftp.horde.org/pub/chora/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	The Horde CVS web-viewer
 
 #-----------------------------------------------------------------------
diff --git a/devel/horde-chora/Makefile b/devel/horde-chora/Makefile
index 76fe46c6334e..0c4ece6cdddf 100644
--- a/devel/horde-chora/Makefile
+++ b/devel/horde-chora/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/chora/				\
 		http://ftp.horde.org/pub/chora/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	The Horde CVS web-viewer
 
 #-----------------------------------------------------------------------
diff --git a/devel/p5-File-Tail/Makefile b/devel/p5-File-Tail/Makefile
index f8b42ce67d22..402e02748dea 100644
--- a/devel/p5-File-Tail/Makefile
+++ b/devel/p5-File-Tail/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	File
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Perl Module to read the end of a file as it\'s appended to
 
 PERL_CONFIGURE=	YES
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index db4973ad0dad..beab3531278e 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	Term
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Term-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Perl 5 module that allows Term::ReadLine to use GNU readline
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile
index d4a12c2a68a0..a657f6480bb5 100644
--- a/devel/p5-ReadLine-Perl/Makefile
+++ b/devel/p5-ReadLine-Perl/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	Term
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Term-${PORTNAME}-${PORTVERSION:C/0+$//}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Perl 5 module for Term::ReadLine editing without GNU readline
 
 PERL_CONFIGURE=	YES
diff --git a/devel/ragel/Makefile b/devel/ragel/Makefile
index aa231014eeb4..3dd81c6b3d58 100644
--- a/devel/ragel/Makefile
+++ b/devel/ragel/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://www.cs.queensu.ca/home/thurston/ragel/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Compile regular languages into executable C/C++ code
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 67d3f6fdace0..8dc9ee076920 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	0.4.0
 CATEGORIES=	devel lang
 MASTER_SITES=	http://www.tortall.net/projects/yasm/releases/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A complete rewrite of the NASM assembler
 
 USE_ICONV=	yes
diff --git a/devel/zthread/Makefile b/devel/zthread/Makefile
index 1ba3ce1470c0..cf8f91d23511 100644
--- a/devel/zthread/Makefile
+++ b/devel/zthread/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	ZThread-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A platform-independent object-oriented C++ threading library
 
 GNU_CONFIGURE=	yes
diff --git a/editors/f4l/Makefile b/editors/f4l/Makefile
index b397f4205ea0..7e5170a75b4d 100644
--- a/editors/f4l/Makefile
+++ b/editors/f4l/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	editors multimedia www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	An open source development environment for Macromedia Flash
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile
index 9ff83a514b98..092f3e3eb82b 100644
--- a/ftp/IglooFTP/Makefile
+++ b/ftp/IglooFTP/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 MASTER_SITE_SUBDIR=	system/network/file-transfer
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Easy to use FTP client for X Window System
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
diff --git a/ftp/gollem/Makefile b/ftp/gollem/Makefile
index 37334847cb17..09f0af31dcc4 100644
--- a/ftp/gollem/Makefile
+++ b/ftp/gollem/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/gollem/				\
 		http://ftp.horde.org/pub/gollem/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Gollem is the Horde web-based File Manager
 
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/ftp/horde-gollem/Makefile b/ftp/horde-gollem/Makefile
index 37334847cb17..09f0af31dcc4 100644
--- a/ftp/horde-gollem/Makefile
+++ b/ftp/horde-gollem/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/gollem/				\
 		http://ftp.horde.org/pub/gollem/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Gollem is the Horde web-based File Manager
 
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index 69a01283ab8e..178318372cf4 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=tuxracer
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
 		${PORTNAME}-data-${PORTVERSION}.tar.gz
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A 3d penguin racing game using OpenGL
 
 LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 69a01283ab8e..178318372cf4 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=tuxracer
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
 		${PORTNAME}-data-${PORTVERSION}.tar.gz
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A 3d penguin racing game using OpenGL
 
 LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 87e7b34537cd..7a8878a38cf4 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aa-project
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	An ascii art library
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
diff --git a/graphics/ale/Makefile b/graphics/ale/Makefile
index 3d9a7f02fa45..62bfaf4b5977 100644
--- a/graphics/ale/Makefile
+++ b/graphics/ale/Makefile
@@ -12,7 +12,7 @@ PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://auricle.dyndns.org/ALE/download/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Anti-Lamenessing Engine
 
 OPTIONS=	DOUBLE "64bit Data Precision Support" off \
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 0ceeb1e7d696..5b8aac13c396 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics tk84
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg		\
diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile
index 95c391f4f744..4592bb96400a 100644
--- a/graphics/libglut/Makefile
+++ b/graphics/libglut/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mesa3d
 DISTNAME=	MesaGLUT-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A graphics library similar to SGI's OpenGL
 
 USE_BZIP2=	yes
diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index 3eca0f88d410..1fd29f29bcc3 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://skuld.bmsc.washington.edu/${PORTNAME}/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 DISTNAME=	Raster3D_${DISTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A set of tools for generating raster images of proteins and molecules
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
diff --git a/irc/cgiirc/Makefile b/irc/cgiirc/Makefile
index 1446ab30c42c..a8600e4a7505 100644
--- a/irc/cgiirc/Makefile
+++ b/irc/cgiirc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	irc www perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	cgiirc
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	IRC web gateway written in Perl
 
 USE_PERL5=	yes
diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile
index 2e5a3bfa9642..929ef6bac813 100644
--- a/irc/ircd-ratbox-devel/Makefile
+++ b/irc/ircd-ratbox-devel/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/	\
 PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	An advanced, stable IRC daemon, used on EFnet ('testing' release)
 
 MAN8=		ircd.8
diff --git a/irc/ircd-ratbox/Makefile b/irc/ircd-ratbox/Makefile
index 8bc1c0045bd4..ce113ccb47b8 100644
--- a/irc/ircd-ratbox/Makefile
+++ b/irc/ircd-ratbox/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/	\
 		ftp://ftp.parodius.com/pub/ircd-ratbox/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	An advanced, stable IRC daemon, used on many EFnet servers
 
 CONFLICTS=	rcd-ratbox-devel-[0-9]*
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 12993255c217..16811e22d9cb 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://coekie.404.be/irssi/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/irssi-devel/
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A modular IRC client with many features
 
 CONFLICTS=	irssi-0.8*
diff --git a/irc/ratbox-respond/Makefile b/irc/ratbox-respond/Makefile
index e56ad0be4790..51924143f424 100644
--- a/irc/ratbox-respond/Makefile
+++ b/irc/ratbox-respond/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/${PORTNAME}/		\
 		ftp://ftp.parodius.com/pub/ircd-ratbox/${PORTNAME}/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Client-side implementation of the challenge oper system in ircd-ratbox
 
 GNU_CONFIGURE=	yes
diff --git a/irc/ratbox-services/Makefile b/irc/ratbox-services/Makefile
index f1440dab7a17..ffab31978a2f 100644
--- a/irc/ratbox-services/Makefile
+++ b/irc/ratbox-services/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/${PORTNAME}/		\
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A highly configurable services package for use with ircd-ratbox
 
 USE_RC_SUBR=	ratbox-services.sh
diff --git a/japanese/plan/Makefile b/japanese/plan/Makefile
index feeb65cecac8..50665b524195 100644
--- a/japanese/plan/Makefile
+++ b/japanese/plan/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	plan
 PORTVERSION=	1.9
 CATEGORIES=	japanese
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 
 MAKE_ENV+=	JAPANESE=yes
 
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index d67c0c80c28d..9c96f2621e9c 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -9,7 +9,7 @@ PORTVERSION=	5.43.0
 CATEGORIES=	lang tcl84 tk84
 MASTER_SITES=	http://expect.nist.gov/src/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A sophisticated scripter based on tcl/tk
 
 .if !defined(WITHOUT_X11)
diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index 614b3ee90fc9..508aa47ede37 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Relay-only Mail Transfer Agent with sendmail compatible syntax
 
 LIB_DEPENDS=	esmtp.6:${PORTSDIR}/mail/libesmtp
diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index b811327b3650..70f7ad993434 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		http://ftp.horde.org/pub/imp/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A webmail system which accesses mail over IMAP
 
 #-----------------------------------------------------------------------
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index 0632847b88ec..66894f273094 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/ingo/				\
 		http://ftp.horde.org/pub/ingo/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Horde\'s email-filter management application
 
 #-----------------------------------------------------------------------
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 7176aa60e4db..e09dee0a54f2 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		http://ftp.horde.org/pub/turba/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	The Horde contact management application
 
 #-----------------------------------------------------------------------
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index b811327b3650..70f7ad993434 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		http://ftp.horde.org/pub/imp/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A webmail system which accesses mail over IMAP
 
 #-----------------------------------------------------------------------
diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile
index 0632847b88ec..66894f273094 100644
--- a/mail/horde4-ingo/Makefile
+++ b/mail/horde4-ingo/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/ingo/				\
 		http://ftp.horde.org/pub/ingo/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Horde\'s email-filter management application
 
 #-----------------------------------------------------------------------
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 7176aa60e4db..e09dee0a54f2 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		http://ftp.horde.org/pub/turba/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	The Horde contact management application
 
 #-----------------------------------------------------------------------
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index b811327b3650..70f7ad993434 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		http://ftp.horde.org/pub/imp/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A webmail system which accesses mail over IMAP
 
 #-----------------------------------------------------------------------
diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile
index 0632847b88ec..66894f273094 100644
--- a/mail/ingo/Makefile
+++ b/mail/ingo/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/ingo/				\
 		http://ftp.horde.org/pub/ingo/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Horde\'s email-filter management application
 
 #-----------------------------------------------------------------------
diff --git a/mail/mutt-ng/Makefile b/mail/mutt-ng/Makefile
index 6cf885294c09..9bce36578b9c 100644
--- a/mail/mutt-ng/Makefile
+++ b/mail/mutt-ng/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://nion.modprobe.de/mutt-ng/snapshots/		\
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 DISTNAME=	muttng-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A fork of the mutt with the goal to incorporate all the patches
 
 GNU_CONFIGURE=	yes
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 7176aa60e4db..e09dee0a54f2 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		http://ftp.horde.org/pub/turba/
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	The Horde contact management application
 
 #-----------------------------------------------------------------------
diff --git a/math/tetgen/Makefile b/math/tetgen/Makefile
index d0ab571efa04..80046e2d43db 100644
--- a/math/tetgen/Makefile
+++ b/math/tetgen/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	math
 MASTER_SITES=	http://www.wias-berlin.de/people/si/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A Quality Tetrahedral Mesh Generator and Delaunay Triangulator
 
 NO_CDROM=	Tetgen is for academic or personal use only
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index 4ea9498d6518..9ab4c68d91a3 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	1.0.61
 CATEGORIES=	math
 MASTER_SITES=	http://yacas.sourceforge.net/backups/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Yet Another Computer Algebra System
 
 LIB_DEPENDS=	gsl.9:${PORTSDIR}/math/gsl
diff --git a/misc/geekcode/Makefile b/misc/geekcode/Makefile
index ab07dbff0543..2aaf1bd6e56f 100644
--- a/misc/geekcode/Makefile
+++ b/misc/geekcode/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	geekcode
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A Geek Code Generator
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/multimedia/helixplayer/Makefile b/multimedia/helixplayer/Makefile
index e4414964eca0..444e023af032 100644
--- a/multimedia/helixplayer/Makefile
+++ b/multimedia/helixplayer/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.7
 CATEGORIES=	multimedia
 MASTER_SITES=	https://helixcommunity.org/download.php/1950/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	The Helix Community's open source media player
 
 LIB_DEPENDS=	theora.[1-9]:${PORTSDIR}/multimedia/libtheora		\
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 5f4a9fd847f4..52da28f110c2 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net-im
 MASTER_SITES=	http://www.process-one.net/en/projects/ejabberd/download/${PORTVERSION}/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 809a586312f6..1a5173fdec72 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT?=	A Qt-based Jabber client
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile
index d25e92e1040a..d67a66f54ab5 100644
--- a/net/6tunnel/Makefile
+++ b/net/6tunnel/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net ipv6
 MASTER_SITES=	http://toxygen.net/6tunnel/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	TCP proxy for applications that don't speak IPv6
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}rc2
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 10e7bc50ea80..362b754152a3 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.maxmind.com/download/geoip/api/c/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Find the country that any IP address or hostname originates from
 
 GNU_CONFIGURE=	yes
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 8182c3814283..e7675fde5c78 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	InterNetNews -- the Internet meets Netnews
 
 USE_RC_SUBR=	innd.sh
diff --git a/news/newsgrab/Makefile b/news/newsgrab/Makefile
index c5de6bcad0bf..202b902bbc28 100644
--- a/news/newsgrab/Makefile
+++ b/news/newsgrab/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	newsgrab
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Download and uudecode binary files from USENET using regexps
 
 RUN_DEPENDS=	${SITE_PERL}/News/NNTPClient.pm:${PORTSDIR}/news/p5-NNTPClient \
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 834799738904..db9c42eadf0a 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -20,7 +20,7 @@ PATCHFILES=	slrn-0.9.8.1-fetch.diff \
 		slrn-0.9.8.1-lastchar2.diff
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	SLang-based newsreader
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
diff --git a/security/clamassassin/Makefile b/security/clamassassin/Makefile
index be387b990ee7..53172b4e034f 100644
--- a/security/clamassassin/Makefile
+++ b/security/clamassassin/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	security
 MASTER_SITES=	http://drivel.com/clamassassin/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A simple virus filter wrapper for ClamAV
 
 BUILD_DEPENDS=	sigtool:${PORTSDIR}/security/clamav \
diff --git a/shells/wapsh/Makefile b/shells/wapsh/Makefile
index 6794bf77d6c6..aaecfd7fe8f0 100644
--- a/shells/wapsh/Makefile
+++ b/shells/wapsh/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.exolution.de/geschaeft/produkte/wapsh/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A system to allow remote shell logins via a WAP phone or web browser
 
 USE_RC_SUBR=	htshd.sh
diff --git a/sysutils/cronolog/Makefile b/sysutils/cronolog/Makefile
index 7bd6fd9c6369..6700d0b50782 100644
--- a/sysutils/cronolog/Makefile
+++ b/sysutils/cronolog/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cronolog.org/download/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A web log rotation utility that provides datestamp filenames
 
 INFO=		cronolog
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index a6ef4c7ac3f5..0c3e5464b409 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.fastcgi.com/dist/
 PKGNAMESUFFIX=	-devkit
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	FastCGI Development Kit
 
 USE_PERL5=	yes
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index f973f534b24d..470ea4de9234 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -22,7 +22,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 PKGNAMESUFFIX=	-php5
 .endif
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A common code-base used by Horde applications, written in PHP
 
 #----------------------------------------------------------------------------
diff --git a/www/horde-passwd/Makefile b/www/horde-passwd/Makefile
index 5162d89523c3..57a260c667fe 100644
--- a/www/horde-passwd/Makefile
+++ b/www/horde-passwd/Makefile
@@ -21,7 +21,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/passwd/				\
 DISTNAME=	passwd-h3-${PORTVERSION}
 DIST_SUBDIR=	horde
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A password changing module for Horde
 
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
diff --git a/www/horde/Makefile b/www/horde/Makefile
index f973f534b24d..470ea4de9234 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -22,7 +22,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 PKGNAMESUFFIX=	-php5
 .endif
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A common code-base used by Horde applications, written in PHP
 
 #----------------------------------------------------------------------------
diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index f973f534b24d..470ea4de9234 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -22,7 +22,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 PKGNAMESUFFIX=	-php5
 .endif
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A common code-base used by Horde applications, written in PHP
 
 #----------------------------------------------------------------------------
diff --git a/www/hydra/Makefile b/www/hydra/Makefile
index fb4e2bf83c1a..18f99232dd44 100644
--- a/www/hydra/Makefile
+++ b/www/hydra/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	0.1.8
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.hellug.gr/pub/software/hydra/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A high performance multi-threaded web server
 
 LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls
diff --git a/www/p5-FastCGI/Makefile b/www/p5-FastCGI/Makefile
index 2bb41732b318..7c45a8bbcee7 100644
--- a/www/p5-FastCGI/Makefile
+++ b/www/p5-FastCGI/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	FCGI
 PKGNAMEPREFIX=	p5-
 DISTNAME=	FCGI-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Modules for perl5, for enabling FastCGI support in CGI scripts
 
 LIB_DEPENDS=	fcgi.0:${PORTSDIR}/www/fcgi
diff --git a/www/phpSysInfo/Makefile b/www/phpSysInfo/Makefile
index ca24185a6c61..6559865e89a1 100644
--- a/www/phpSysInfo/Makefile
+++ b/www/phpSysInfo/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A php script that displays info about the host being accessed
 
 USE_PHP=	pcre xml
diff --git a/www/phpsysinfo-dev/Makefile b/www/phpsysinfo-dev/Makefile
index ca24185a6c61..6559865e89a1 100644
--- a/www/phpsysinfo-dev/Makefile
+++ b/www/phpsysinfo-dev/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A php script that displays info about the host being accessed
 
 USE_PHP=	pcre xml
diff --git a/www/phpsysinfo/Makefile b/www/phpsysinfo/Makefile
index ca24185a6c61..6559865e89a1 100644
--- a/www/phpsysinfo/Makefile
+++ b/www/phpsysinfo/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A php script that displays info about the host being accessed
 
 USE_PHP=	pcre xml
diff --git a/www/quickie/Makefile b/www/quickie/Makefile
index 64de1c75ad52..279d6201e8be 100644
--- a/www/quickie/Makefile
+++ b/www/quickie/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://${PORTNAME}.sourceforge.net/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A small footprint, fast Wiki engine written in C++
 
 GNU_CONFIGURE=	yes
diff --git a/x11-fm/jaffm/Makefile b/x11-fm/jaffm/Makefile
index 19a53d62e6cd..c482ad5cd576 100644
--- a/x11-fm/jaffm/Makefile
+++ b/x11-fm/jaffm/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-fm
 MASTER_SITES=	http://binary.is/download/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A lightweight file manager inspired by MacOS Finder
 
 WXGTK_VER?=	2.6
diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index f5daa5e5bada..1bf32e86c776 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Fast MS-Explorer like filemanager for X
 
 LIB_DEPENDS=	FOX-1.4:${PORTSDIR}/x11-toolkits/fox14 \
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 7ed4263cb35d..0046447438f0 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Cross-platform high-level application framework and GUI library
 
 LIB_DEPENDS=	physfs-1.0.1:${PORTSDIR}/devel/physfs \
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index 7ed4263cb35d..0046447438f0 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	shaun@inerd.com
+MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Cross-platform high-level application framework and GUI library
 
 LIB_DEPENDS=	physfs-1.0.1:${PORTSDIR}/devel/physfs \