Change MAINTAINER address for my ports.

Approved by:	novel (mentor)

110 files changed, 110 insertions, 110 deletions

diff --git a/archivers/deb2targz/Makefile b/archivers/deb2targz/Makefile
index b847e9607cfa..e389d6032c9d 100644
--- a/archivers/deb2targz/Makefile
+++ b/archivers/deb2targz/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	20021217
 CATEGORIES=	archivers perl5
 MASTER_SITES=	http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command-line utility for converting a Debian .deb file to a .tar.gz
 
 USE_PERL5=	yes
diff --git a/archivers/ecm/Makefile b/archivers/ecm/Makefile
index 2aa596282eec..bd7124821332 100644
--- a/archivers/ecm/Makefile
+++ b/archivers/ecm/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0
 CATEGORIES=	archivers
 MASTER_SITES=	http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Compresses CD images by stripping unnecessary EDC/ECC data
 
 PLIST_FILES=	bin/ecm bin/unecm
diff --git a/archivers/gzrecover/Makefile b/archivers/gzrecover/Makefile
index 3192c5807a0c..321ffcb5a35b 100644
--- a/archivers/gzrecover/Makefile
+++ b/archivers/gzrecover/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	archivers
 MASTER_SITES=	http://www.urbanophile.com/arenn/hacking/gzrt/
 DISTNAME=	gzrt-${PORTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A gzip recovery toolkit
 
 CFLAGS+=	-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
diff --git a/archivers/mar/Makefile b/archivers/mar/Makefile
index 05479e2adb65..23489ff41ca1 100644
--- a/archivers/mar/Makefile
+++ b/archivers/mar/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.emantic.co.uk/mark/files/ \
 		http://critical.ch/mar/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A simple binary file format for storing arbitrary meta and user data
 
 USE_REINPLACE=	yes
diff --git a/archivers/ppmd/Makefile b/archivers/ppmd/Makefile
index ab334fb894fa..dbe0abda746e 100644
--- a/archivers/ppmd/Makefile
+++ b/archivers/ppmd/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	20050811
 CATEGORIES=	archivers
 MASTER_SITES=	http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A fast archiver with a good compression ratio
 
 MAN1=		ppmd.1
diff --git a/archivers/tardy/Makefile b/archivers/tardy/Makefile
index c3e5d2d26f35..25cc2456ba92 100644
--- a/archivers/tardy/Makefile
+++ b/archivers/tardy/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	1.12
 CATEGORIES=	archivers
 MASTER_SITES=	http://tardy.sourceforge.net/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Manipulate the file headers in tar archive files in various ways
 
 USE_REINPLACE=	yes
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index d96452a125e5..18ff5352cba6 100644
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://de.aminet.net/pub/aminet/misc/unix/ \
 DISTNAME=	${PORTNAME}.c
 EXTRACT_SUFX=	.gz
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Extracts .lzx archives from Amiga systems
 
 PLIST_FILES=	bin/unlzx
diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile
index 71ebd0fe3e00..56397c9b36ef 100644
--- a/archivers/unzoo/Makefile
+++ b/archivers/unzoo/Makefile
@@ -10,7 +10,7 @@ DISTVERSION=	4.4
 CATEGORIES=	archivers
 MASTER_SITES=	http://critical.ch/unzoo/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A zoo archive extractor
 
 EXTRA_DEFINES=	-DSYS_IS_UNIX -DSYS_HAS_MKDIR
diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index 0df696dda305..a24f92475afc 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	adplug
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	AdLib player using adplug library
 
 LIB_DEPENDS=	adplug-1.5.1:${PORTSDIR}/audio/libadplug
diff --git a/audio/aylet/Makefile b/audio/aylet/Makefile
index 0f22a7761e09..cc9ea34af616 100644
--- a/audio/aylet/Makefile
+++ b/audio/aylet/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.ibiblio.org/pub/Linux/apps/sound/players/
 PKGNAMEPREFIX?=
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line player for the .ay audio file format
 
 USE_REINPLACE=	yes
diff --git a/audio/bmp-fc/Makefile b/audio/bmp-fc/Makefile
index cae58acc3671..bc5822956465 100644
--- a/audio/bmp-fc/Makefile
+++ b/audio/bmp-fc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	xmms-fc
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A Future Composer input plug-in for beep-media-player
 
 LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player
diff --git a/audio/checkmate/Makefile b/audio/checkmate/Makefile
index a484be8b99a1..5e965ca6b774 100644
--- a/audio/checkmate/Makefile
+++ b/audio/checkmate/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.10
 CATEGORIES=	audio
 MASTER_SITES=	http://mpck.linuxonly.nl/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command-line utility for checking mp3 files for errors
 
 GNU_CONFIGURE=	yes
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index 4041601d28df..bac0ce521723 100644
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/festalon/
 PKGNAMEPREFIX?=
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT?=	A command line player for .nsf and .hes audio files
 
 LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
index 387369efb812..44159b951eeb 100644
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/gbsplay/
 PKGNAMEPREFIX?=
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT?=	Emulates the sound hardware of the Nintendo Game Boy(TM)
 
 USE_REINPLACE=	yes
diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile
index 7eb89dd99713..1b8d0a16042c 100644
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	adplug
 DISTNAME=	adplug-${PORTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	AdLib emulator library supporting many formats
 
 LIB_DEPENDS=	binio.1:${PORTSDIR}/devel/libbinio
diff --git a/audio/libcddb-doc/Makefile b/audio/libcddb-doc/Makefile
index 8688b89917fa..fecbebaec298 100644
--- a/audio/libcddb-doc/Makefile
+++ b/audio/libcddb-doc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libcddb
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Libcddb documentation
 
 USE_BZIP2=	yes
diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile
index f5114a818705..36fcbee6a213 100644
--- a/audio/libmodplug/Makefile
+++ b/audio/libmodplug/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	modplug-xmms
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	ModPlug mod-like music shared libraries
 
 INSTALLS_SHLIB=	yes
diff --git a/audio/malint/Makefile b/audio/malint/Makefile
index fadf6cd6f0cd..cb45c1c752c1 100644
--- a/audio/malint/Makefile
+++ b/audio/malint/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.nih.at/malint/ \
 		ftp://sunsite.univie.ac.at/pub/nih/malint/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	MPEG Audio stream validator
 
 GNU_CONFIGURE=	yes
diff --git a/audio/modplugplay/Makefile b/audio/modplugplay/Makefile
index b9382cab8526..2c8eb0863590 100644
--- a/audio/modplugplay/Makefile
+++ b/audio/modplugplay/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.linuks.mine.nu/modplugplay/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A commandline music mod player using libmodplug
 
 LIB_DEPENDS=	modplug.0:${PORTSDIR}/audio/libmodplug
diff --git a/audio/mp-player/Makefile b/audio/mp-player/Makefile
index 877520ac8ba7..330707bf32e7 100644
--- a/audio/mp-player/Makefile
+++ b/audio/mp-player/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://mp.waw.cx/ \
 DISTNAME=	mp-current
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A curses based module tracker using libmikmod
 
 LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod
diff --git a/audio/mp3guessenc/Makefile b/audio/mp3guessenc/Makefile
index 3c2290f9ea62..f54df52aeca0 100644
--- a/audio/mp3guessenc/Makefile
+++ b/audio/mp3guessenc/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.21
 CATEGORIES=	audio
 MASTER_SITES=	http://shibatch.sourceforge.net/download/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Utility for guessing which encoder was used to encode an mp3 file
 
 USE_ZIP=	yes
diff --git a/audio/mpck/Makefile b/audio/mpck/Makefile
index a484be8b99a1..5e965ca6b774 100644
--- a/audio/mpck/Makefile
+++ b/audio/mpck/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.10
 CATEGORIES=	audio
 MASTER_SITES=	http://mpck.linuxonly.nl/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command-line utility for checking mp3 files for errors
 
 GNU_CONFIGURE=	yes
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 741070e3c49e..a2994c51177c 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://labs.nixia.no/ \
 		http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	The legendary Open Cubic Player
 
 LIB_DEPENDS=	id3tag.2:${PORTSDIR}/audio/libid3tag \
diff --git a/audio/openspc/Makefile b/audio/openspc/Makefile
index 7c2e971b6373..a24dec4444fa 100644
--- a/audio/openspc/Makefile
+++ b/audio/openspc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://membres.lycos.fr/pixels/
 DISTNAME=	OpenSPC-${PORTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line player for .spc and .zst files
 
 ONLY_FOR_ARCHS=	i386	# contains x86 asm code
diff --git a/audio/penguinsap/Makefile b/audio/penguinsap/Makefile
index 7264b9a5df61..92ee66f3828b 100644
--- a/audio/penguinsap/Makefile
+++ b/audio/penguinsap/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.1
 CATEGORIES=	audio
 MASTER_SITES=	http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line Atari(TM) .sap player
 
 USE_REINPLACE=	yes
diff --git a/audio/playgsf/Makefile b/audio/playgsf/Makefile
index 0974a4564bc9..3eb850e0b1f2 100644
--- a/audio/playgsf/Makefile
+++ b/audio/playgsf/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.6
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/playgsf/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line player for gsf audio files
 
 USE_GMAKE=	yes
diff --git a/audio/resid/Makefile b/audio/resid/Makefile
index a895485ac0a0..0eecc0e966f9 100644
--- a/audio/resid/Makefile
+++ b/audio/resid/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.16
 CATEGORIES=	audio emulators
 MASTER_SITES=	ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/resid/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Cycle-based SID emulator engine
 
 USE_LIBTOOL_VER=15
diff --git a/audio/schism/Makefile b/audio/schism/Makefile
index 424981522ff3..65bcbfdfa548 100644
--- a/audio/schism/Makefile
+++ b/audio/schism/Makefile
@@ -10,7 +10,7 @@ DISTVERSION=	0.2a
 CATEGORIES=	audio
 MASTER_SITES=	http://rigelseven.com/schism/dl/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A module tracker editor/player resembling impulse tracker
 
 ONLY_FOR_ARCHS=	i386
diff --git a/audio/sfront/Makefile b/audio/sfront/Makefile
index 40bec9f75fc2..9b63faac9355 100644
--- a/audio/sfront/Makefile
+++ b/audio/sfront/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.89
 CATEGORIES=	audio
 MASTER_SITES=	http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A translator that converts MP4-SA files into efficient C programs
 
 PORTDOCS=	book sfman
diff --git a/audio/sidplayer/Makefile b/audio/sidplayer/Makefile
index 5ddbb5f32833..6f9d28c7c4b0 100644
--- a/audio/sidplayer/Makefile
+++ b/audio/sidplayer/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://wwwthep.physik.uni-mainz.de/~cbauer/
 DISTNAME=	SIDPlayer-${PORTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A C64 SID tune player
 
 USE_SDL=	yes
diff --git a/audio/wav2cdr/Makefile b/audio/wav2cdr/Makefile
index ae7491b782d5..3f148cba3e81 100644
--- a/audio/wav2cdr/Makefile
+++ b/audio/wav2cdr/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio converters
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/sound/convert
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Converts WAV files into CDR audio file format
 
 USE_GETOPT_LONG=yes
diff --git a/audio/xmms-ahx/Makefile b/audio/xmms-ahx/Makefile
index deea2ea01219..bbd2a6e025a2 100644
--- a/audio/xmms-ahx/Makefile
+++ b/audio/xmms-ahx/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	XMMS plugin for playing AHX tunes
 
 BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
diff --git a/audio/xmms-nsf/Makefile b/audio/xmms-nsf/Makefile
index 8d02f84efc85..735b25f01a10 100644
--- a/audio/xmms-nsf/Makefile
+++ b/audio/xmms-nsf/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://optronic.sourceforge.net/files/ \
 		http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	XMMS input-plugin for playing Nintendo(TM) NSF audio files
 
 BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
diff --git a/audio/xmms-openspc/Makefile b/audio/xmms-openspc/Makefile
index 40649d170542..a2a201400b1c 100644
--- a/audio/xmms-openspc/Makefile
+++ b/audio/xmms-openspc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://critical.ch/distfiles/ \
 PKGNAMEPREFIX=	xmms-
 DISTNAME=	xmms-OpenSPC-${PORTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	An SPC player for XMMS using OpenSPC
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm \
diff --git a/audio/xmms-rateplug/Makefile b/audio/xmms-rateplug/Makefile
index de9de52cbaf8..2482554429cd 100644
--- a/audio/xmms-rateplug/Makefile
+++ b/audio/xmms-rateplug/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	xmmsassesment
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Add song rating control to the XMMS playlist
 
 BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
diff --git a/audio/xmms-sapplug/Makefile b/audio/xmms-sapplug/Makefile
index 4c84a4962007..94063b034891 100644
--- a/audio/xmms-sapplug/Makefile
+++ b/audio/xmms-sapplug/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://critical.ch/distfiles/ \
 		ftp://ftp.atari.art.pl/stuff/audio/8bit-music-archive/sap/plugins/xmms/
 DISTNAME=	sapplug-xmms-${DISTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	XMMS input plugin for playing 8bit Atari(TM) .sap audio files
 
 BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
diff --git a/audio/xmms-sexypsf/Makefile b/audio/xmms-sexypsf/Makefile
index ce90f6178707..e9dbe9f4c201 100644
--- a/audio/xmms-sexypsf/Makefile
+++ b/audio/xmms-sexypsf/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/sexypsf/
 DISTNAME=	sexypsf-${PORTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	XMMS plugin for playing .psf files
 
 BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
diff --git a/audio/xmms-xymms/Makefile b/audio/xmms-xymms/Makefile
index 3840a0d96d64..0790bf4c71af 100644
--- a/audio/xmms-xymms/Makefile
+++ b/audio/xmms-xymms/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	xmms-
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Sega Genesis GYM plugin for XMMS
 
 BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
diff --git a/audio/yell/Makefile b/audio/yell/Makefile
index c375b4affb7c..32085c1a58ee 100644
--- a/audio/yell/Makefile
+++ b/audio/yell/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.critical.ch/yell/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line speaker bell using machine/speaker.h
 
 PLIST_FILES=	bin/yell
diff --git a/devel/cvsspam/Makefile b/devel/cvsspam/Makefile
index 8f86c30a7ac2..d1e02e6766d7 100644
--- a/devel/cvsspam/Makefile
+++ b/devel/cvsspam/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.2.12
 CATEGORIES=	devel
 MASTER_SITES=	http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Sends diffs when a change is committed to your CVS repository
 
 USE_RUBY=	yes
diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile
index 87384c8a331d..106a99bdec88 100644
--- a/devel/libbinio/Makefile
+++ b/devel/libbinio/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Binary I/O stream class library
 
 INSTALLS_SHLIB=	yes
diff --git a/devel/p5-Sort-Array/Makefile b/devel/p5-Sort-Array/Makefile
index e7a887930051..4f850bea669e 100644
--- a/devel/p5-Sort-Array/Makefile
+++ b/devel/p5-Sort-Array/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Sort
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A powerful array sorting Perl interface
 
 PERL_CONFIGURE=	yes
diff --git a/dns/zonenotify/Makefile b/dns/zonenotify/Makefile
index 5b259b2233a5..3e106d2a646d 100644
--- a/dns/zonenotify/Makefile
+++ b/dns/zonenotify/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	dns
 MASTER_SITES=	http://morettoni.net/bsd/ \
 		http://cvs.delink.net/mirrors/morettoni.net/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A dns notify sender written in C
 
 PLIST_FILES=	bin/zonenotify
diff --git a/finance/ccard/Makefile b/finance/ccard/Makefile
index be9e7c073a60..4427b90ead52 100644
--- a/finance/ccard/Makefile
+++ b/finance/ccard/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	finance
 MASTER_SITES=	http://www.canb.auug.org.au/~millerp/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line offline credit card validator/analyzer
 
 GNU_CONFIGURE=	yes
diff --git a/ftp/weex/Makefile b/ftp/weex/Makefile
index 3a364f3c6a5c..af7ae8245eef 100644
--- a/ftp/weex/Makefile
+++ b/ftp/weex/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A non-interactive FTP client
 
 GNU_CONFIGURE=	yes
diff --git a/games/filters/Makefile b/games/filters/Makefile
index bdb678a265d1..a7aed03195bc 100644
--- a/games/filters/Makefile
+++ b/games/filters/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games perl5
 MASTER_SITES=	http://ftp.debian.org/debian/pool/main/f/filters/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A collection of filters, including B1FF and the Swedish Chef
 
 CONFLICTS=	talkfilters-* jive-* chef-*
diff --git a/games/textmaze/Makefile b/games/textmaze/Makefile
index d3d14d883151..4408ea7fcb46 100644
--- a/games/textmaze/Makefile
+++ b/games/textmaze/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games perl5
 MASTER_SITES=	http://www.robobunny.com/projects/textmaze/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Generates mazes on a text terminal and lets you traverse them
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
diff --git a/games/typespeed/Makefile b/games/typespeed/Makefile
index 08d5c2caead1..b4cbaa649a60 100644
--- a/games/typespeed/Makefile
+++ b/games/typespeed/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://ls.purkki.org/typespeed/
 DISTNAME=	typespeed-${PORTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Test your typing speed, and get your fingers\' CPS
 
 MAN1=		typespeed.1
diff --git a/german/schwobifyer/Makefile b/german/schwobifyer/Makefile
index 20888d536d57..4c7488057569 100644
--- a/german/schwobifyer/Makefile
+++ b/german/schwobifyer/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	german
 MASTER_SITES=	http://critical.ch/distfiles/
 PKGNAMEPREFIX=	de-
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A utility for translating german into the schwaebisch dialect
 
 PLIST_FILES=	bin/schwobifyer
diff --git a/german/swissgerman-ding/Makefile b/german/swissgerman-ding/Makefile
index c27663838f15..0c4389f1f52c 100644
--- a/german/swissgerman-ding/Makefile
+++ b/german/swissgerman-ding/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	# none
 PKGNAMEPREFIX=	de-
 DISTFILES=	# none
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A swiss high german german doppel-s free language pack for de-ding
 
 RUN_DEPENDS=	${DICTFILE}:${PORTSDIR}/german/ding
diff --git a/graphics/bmp2html/Makefile b/graphics/bmp2html/Makefile
index 5bba6071df21..7f0d5cdb3a4f 100644
--- a/graphics/bmp2html/Makefile
+++ b/graphics/bmp2html/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://critical.ch/distfiles/
 MASTER_SITES+=	http://www.dasfisk.dk/bmp2html/
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A bmp to html converter
 
 USE_SDL=	yes
diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile
index 4d5b97232507..e4e9e863cc25 100644
--- a/graphics/exrtools/Makefile
+++ b/graphics/exrtools/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://scanline.ca/exrtools/ \
 		http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Utilities for manipulating with HDR images in OpenEXR format
 
 LIB_DEPENDS=	Half:${PORTSDIR}/graphics/OpenEXR \
diff --git a/graphics/fig2sxd/Makefile b/graphics/fig2sxd/Makefile
index 3ef861f41868..5af9394a5d21 100644
--- a/graphics/fig2sxd/Makefile
+++ b/graphics/fig2sxd/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Convert .xfig files to the OpenOffice draw format
 
 USE_GMAKE=	yes
diff --git a/graphics/metacam/Makefile b/graphics/metacam/Makefile
index c56812d0fcd2..843964e6cc8b 100644
--- a/graphics/metacam/Makefile
+++ b/graphics/metacam/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cheeseplant.org/pub/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A digital camera EXIF meta-information reader
 
 USE_GMAKE=	yes
diff --git a/graphics/pecomato/Makefile b/graphics/pecomato/Makefile
index 641ac5fbd952..a7c5a99a388c 100644
--- a/graphics/pecomato/Makefile
+++ b/graphics/pecomato/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.0.12
 CATEGORIES=	graphics
 MASTER_SITES=	http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command-line picture metadata processor
 
 USE_GMAKE=	yes
diff --git a/graphics/recoverjpeg/Makefile b/graphics/recoverjpeg/Makefile
index 88cb830e65a2..22a4c4584a46 100644
--- a/graphics/recoverjpeg/Makefile
+++ b/graphics/recoverjpeg/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.rfc1149.net/download/recoverjpeg/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Recoverjpeg tries to recover JFIF (JPEG) pictures from a peripheral
 
 GNU_CONFIGURE=	yes
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index 14bae682d794..94b5e99e4f7b 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A tool to draw pictures on your root window
 
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
diff --git a/irc/netwalker-ircc/Makefile b/irc/netwalker-ircc/Makefile
index 4290840f6d8b..f99333f06ffa 100644
--- a/irc/netwalker-ircc/Makefile
+++ b/irc/netwalker-ircc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	irc
 MASTER_SITES=	http://critical.ch/netwalker-ircc/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A lightweight curses-based IRC client
 
 MAN1=		netwalker.1
diff --git a/mail/cyrus2courier/Makefile b/mail/cyrus2courier/Makefile
index e1fbad89ed4c..50c1ed9e71b2 100644
--- a/mail/cyrus2courier/Makefile
+++ b/mail/cyrus2courier/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://www.madness.at/~mad/projects/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A Cyrus-Imap to Maildir++ conversion utility
 
 USE_GETOPT_LONG=yes
diff --git a/mail/delatt/Makefile b/mail/delatt/Makefile
index 6f428277f7e2..67e79f11e40e 100644
--- a/mail/delatt/Makefile
+++ b/mail/delatt/Makefile
@@ -10,7 +10,7 @@ DISTVERSION=	1.1.3
 CATEGORIES=	mail
 MASTER_SITES=	http://danborn.net/delatt/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Strip attachments from email
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index 490fd781ffb8..e2cb3cce4352 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	BSD mail utility with MIME extensions
 
 USE_BZIP2=	yes
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index 490fd781ffb8..e2cb3cce4352 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	BSD mail utility with MIME extensions
 
 USE_BZIP2=	yes
diff --git a/mail/nbsmtp/Makefile b/mail/nbsmtp/Makefile
index 7c56850d3e1b..09456624f217 100644
--- a/mail/nbsmtp/Makefile
+++ b/mail/nbsmtp/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://www.gentoo-es.org/~ferdy/ \
 		http://www.it.uc3m.es/~ferdy/nbsmtp/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Simple program for outgoing SMTP delivery
 
 GNU_CONFIGURE=	yes
diff --git a/mail/p5-Sendmail-AccessDB/Makefile b/mail/p5-Sendmail-AccessDB/Makefile
index 9c2235cfc66b..447e26e1a9e1 100644
--- a/mail/p5-Sendmail-AccessDB/Makefile
+++ b/mail/p5-Sendmail-AccessDB/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Sendmail
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Perl5 interface to the Sendmail access.db list
 
 BUILD_DEPENDS=	${SITE_PERL}/mach/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB
diff --git a/mail/qmail-rblchk/Makefile b/mail/qmail-rblchk/Makefile
index db9f6f5948f8..cb37b56c2073 100644
--- a/mail/qmail-rblchk/Makefile
+++ b/mail/qmail-rblchk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.2
 CATEGORIES=	mail
 MASTER_SITES=	http://morettoni.net/qmail/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A qmail RBL filter
 
 RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
diff --git a/mail/spfval/Makefile b/mail/spfval/Makefile
index c060dc91b93d..21e1b636bfda 100644
--- a/mail/spfval/Makefile
+++ b/mail/spfval/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.0.1
 CATEGORIES=	mail
 MASTER_SITES=	http://spfval.codeshare.ca/files/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A SPF validator
 
 USE_BZIP2=	yes
diff --git a/misc/countrycodes/Makefile b/misc/countrycodes/Makefile
index a9f6ed4755e2..d4888d8ecd3d 100644
--- a/misc/countrycodes/Makefile
+++ b/misc/countrycodes/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.5
 CATEGORIES=	misc
 MASTER_SITES=	http://www.grigna.com/diego/linux/countrycodes/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	An ISO 3166 country code finder
 
 BUILD_WRKSRC=	${WRKSRC}/src
diff --git a/misc/ddate/Makefile b/misc/ddate/Makefile
index 13a7978086a3..f34eed1b83d3 100644
--- a/misc/ddate/Makefile
+++ b/misc/ddate/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc
 MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux/
 DISTNAME=	util-linux-${PORTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Command to print the date in Discordian date format
 
 PLIST_FILES=	bin/ddate
diff --git a/misc/gnu-watch/Makefile b/misc/gnu-watch/Makefile
index c84c25137462..57a7fd201490 100644
--- a/misc/gnu-watch/Makefile
+++ b/misc/gnu-watch/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://procps.sourceforge.net/
 PKGNAMEPREFIX=	gnu-
 DISTNAME=	procps-${DISTVERSION}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	GNU watch command
 
 USE_GETOPT_LONG=yes
diff --git a/misc/gopod/Makefile b/misc/gopod/Makefile
index 4c4e93900633..f13db8e8fc58 100644
--- a/misc/gopod/Makefile
+++ b/misc/gopod/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc
 MASTER_SITES=	http://gopod.free-go.net/
 DISTNAME=	goPod-${PORTVERSION}_linux_bsd
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Utility to cap/uncap an iPod
 
 GNU_CONFIGURE=	yes
diff --git a/misc/ree/Makefile b/misc/ree/Makefile
index cb6da382536c..68f742bda3ee 100644
--- a/misc/ree/Makefile
+++ b/misc/ree/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc
 MASTER_SITES=	http://www.linuks.mine.nu/ree/ \
 		http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A tool to dump your ROM extensions
 
 PLIST_FILES=	bin/rom-ree bin/fontdump
diff --git a/net-im/bsflite/Makefile b/net-im/bsflite/Makefile
index 48a8eba5e4d6..519a6e733a1f 100644
--- a/net-im/bsflite/Makefile
+++ b/net-im/bsflite/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=bsflite
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A lightweight command line AIM client
 
 USE_REINPLACE=	yes
diff --git a/net/bsflite/Makefile b/net/bsflite/Makefile
index 48a8eba5e4d6..519a6e733a1f 100644
--- a/net/bsflite/Makefile
+++ b/net/bsflite/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=bsflite
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A lightweight command line AIM client
 
 USE_REINPLACE=	yes
diff --git a/net/httping/Makefile b/net/httping/Makefile
index f36467ed4e42..2bda61a071b7 100644
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.vanheusden.com/httping/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A ping-like tool for HTTP requests
 
 CFLAGS+=	-DVERSION=\"${PORTVERSION}\"
diff --git a/net/micro_proxy/Makefile b/net/micro_proxy/Makefile
index 87ef3f122bb8..f07f4974bdf7 100644
--- a/net/micro_proxy/Makefile
+++ b/net/micro_proxy/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.acme.com/software/micro_proxy/ \
 		http://critical.ch/distfiles/
 DISTNAME=	${PORTNAME}_30oct2002
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A really small HTTP/HTTPS proxy
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/net/recvnet/Makefile b/net/recvnet/Makefile
index 3204d1bcd868..df342f4a437a 100644
--- a/net/recvnet/Makefile
+++ b/net/recvnet/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.vanheusden.com/Linux/ \
 		http://critical.ch/distfiles/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Recvnet (inverse telnet) is a utility for debugging tcp connections
 
 CFLAGS+=	-DVERSION=\"${PORTVERSION}\"
diff --git a/news/brag/Makefile b/news/brag/Makefile
index cf5faea42b5f..73dc44223275 100644
--- a/news/brag/Makefile
+++ b/news/brag/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.4.1
 CATEGORIES=	news tcl84
 MASTER_SITES=	http://brag.sourceforge.net/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Download and assemble multipart binaries from newsgroups
 
 RUN_DEPENDS=	uudeview:${PORTSDIR}/converters/uudeview \
diff --git a/security/bcrypt/Makefile b/security/bcrypt/Makefile
index 929493b6c88c..c6480ac8554e 100644
--- a/security/bcrypt/Makefile
+++ b/security/bcrypt/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1
 CATEGORIES=	security
 MASTER_SITES=	http://bcrypt.sourceforge.net/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A cross-plattform blowfish encryption utility
 
 USE_REINPLACE=	yes
diff --git a/security/bsdsfv/Makefile b/security/bsdsfv/Makefile
index e156e8f30252..6d0a376a8057 100644
--- a/security/bsdsfv/Makefile
+++ b/security/bsdsfv/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A flexible SFV checksum utility
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/security/cksfv/Makefile b/security/cksfv/Makefile
index 4352bb769382..723643642153 100644
--- a/security/cksfv/Makefile
+++ b/security/cksfv/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.3.6
 CATEGORIES=	security
 MASTER_SITES=	http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/files/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Create or manipulate Simple File Verification (SFV) checksum files
 
 PLIST_FILES=	bin/cksfv
diff --git a/security/idea/Makefile b/security/idea/Makefile
index 9f9efb6e3aac..a3d8f40d036f 100644
--- a/security/idea/Makefile
+++ b/security/idea/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.funet.fi/pub/org/CERT/ftp.cert.dfn.de/pub/tools/crypt/i
 DISTNAME=	${PORTNAME}.V${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line idea encryption and decryption utility
 
 RESTRICTED=	"Crypto; IDEA is a patented algorithm that requires proper licensing"
diff --git a/security/pkcrack/Makefile b/security/pkcrack/Makefile
index dc5142f25c46..69f9a80a926c 100644
--- a/security/pkcrack/Makefile
+++ b/security/pkcrack/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.2.2
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A utility for breaking pkzip encryption
 
 USE_GMAKE=	yes
diff --git a/security/proxytunnel/Makefile b/security/proxytunnel/Makefile
index fd5cc5001f9d..8be5083a32ac 100644
--- a/security/proxytunnel/Makefile
+++ b/security/proxytunnel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Connects stdin and stdout to an origin server through an HTTPS proxy
 
 USE_GETOPT_LONG=yes
diff --git a/security/pure-sfv/Makefile b/security/pure-sfv/Makefile
index a32456899e5d..bd8803f1c5b1 100644
--- a/security/pure-sfv/Makefile
+++ b/security/pure-sfv/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Utility to test and create .sfv files
 
 USE_GMAKE=	yes
diff --git a/security/tthsum/Makefile b/security/tthsum/Makefile
index 677c53c33360..ad583215470f 100644
--- a/security/tthsum/Makefile
+++ b/security/tthsum/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1.0
 CATEGORIES=	security
 MASTER_SITES=	http://wza.digitalbrains.com/source/tthsum/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command-line utility for generating and checking TTH message digests
 
 USE_GMAKE=	yes
diff --git a/sysutils/cdircmp/Makefile b/sysutils/cdircmp/Makefile
index 739e4bf98c7d..3cf8aa536f25 100644
--- a/sysutils/cdircmp/Makefile
+++ b/sysutils/cdircmp/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://home.hccnet.nl/paul.schuurmans/download/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Compare directories and select files to copy
 
 LDFLAGS+=	-lncurses -lform
diff --git a/sysutils/cmospwd/Makefile b/sysutils/cmospwd/Makefile
index 6975798acb98..cdb34ec736fe 100644
--- a/sysutils/cmospwd/Makefile
+++ b/sysutils/cmospwd/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	4.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cgsecurity.org/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A BIOS password recovery tool
 
 USE_REINPLACE=	yes
diff --git a/sysutils/disktype/Makefile b/sysutils/disktype/Makefile
index 02cf628f04aa..b5f80327c423 100644
--- a/sysutils/disktype/Makefile
+++ b/sysutils/disktype/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Disk formatting type autodetector
 
 USE_REINPLACE=	yes
diff --git a/sysutils/fatback/Makefile b/sysutils/fatback/Makefile
index cb2c60bedeff..afdeae7c660d 100644
--- a/sysutils/fatback/Makefile
+++ b/sysutils/fatback/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Recover deleted files from FAT filesystems
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/fdupes/Makefile b/sysutils/fdupes/Makefile
index 9758f20f9ac6..cb6b1ac7e97e 100644
--- a/sysutils/fdupes/Makefile
+++ b/sysutils/fdupes/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.40
 CATEGORIES=	sysutils
 MASTER_SITES=	http://netdial.caribe.net/~adrian2/programs/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Fdupes is a program for identifying or deleting duplicate files
 
 USE_GETOPT_LONG=	yes
diff --git a/sysutils/highlnk/Makefile b/sysutils/highlnk/Makefile
index f94572a47f23..75ba72857152 100644
--- a/sysutils/highlnk/Makefile
+++ b/sysutils/highlnk/Makefile
@@ -10,7 +10,7 @@ DISTVERSION=	0.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.perli.net/projekte/highlnk/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A tool to save disk space on hard disks by using hardlinks
 
 USE_REINPLACE=	yes
diff --git a/sysutils/hilite/Makefile b/sysutils/hilite/Makefile
index d4ba5b1a008d..4a16c9386c59 100644
--- a/sysutils/hilite/Makefile
+++ b/sysutils/hilite/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.c
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command-line utility to highlight anything printed to stderr
 
 PLIST_FILES=	bin/hilite
diff --git a/sysutils/magicrescue/Makefile b/sysutils/magicrescue/Makefile
index 1179d157bed8..e79790dc8b7e 100644
--- a/sysutils/magicrescue/Makefile
+++ b/sysutils/magicrescue/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1.4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://jbj.rapanden.dk/magicrescue/release/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A file recovery tool which recovers deleted files from a block device
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/most/Makefile b/sysutils/most/Makefile
index 96fb8b25a384..fd35676c9087 100644
--- a/sysutils/most/Makefile
+++ b/sysutils/most/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://space.mit.edu/pub/davis/most/ \
 		ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/most/ \
 		http://gd.tuwien.ac.at/editors/davis/most/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A pager (like less) which has support for windows and binary files
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
diff --git a/sysutils/rej/Makefile b/sysutils/rej/Makefile
index c774a20231e7..b15830058b97 100644
--- a/sysutils/rej/Makefile
+++ b/sysutils/rej/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils perl5
 MASTER_SITES=	http://critical.ch/distfiles/ \
 		http://ftp.suse.com/pub/people/mason/rej/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Merges patch-rejects and runs a merge program to verify the changes
 
 USE_PERL5=	yes
diff --git a/sysutils/tmpreaper/Makefile b/sysutils/tmpreaper/Makefile
index dc3a2a1f8e83..001a71875dcc 100644
--- a/sysutils/tmpreaper/Makefile
+++ b/sysutils/tmpreaper/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTFILES=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Cleans up files in directories based on their age
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/vii/Makefile b/sysutils/vii/Makefile
index 6666ab10bcd6..f0e3689f635a 100644
--- a/sysutils/vii/Makefile
+++ b/sysutils/vii/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	4.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://vii.sourceforge.net/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Execute a command repeatedly and scroll the output
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/watchfolder/Makefile b/sysutils/watchfolder/Makefile
index 1c13922231c1..1954ee69587d 100644
--- a/sysutils/watchfolder/Makefile
+++ b/sysutils/watchfolder/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dstunrea.sdf-eu.org/files/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Watch folders for new files and process them
 
 WRKSRC=		${WRKDIR}/watchd-${PORTVERSION}
diff --git a/sysutils/wuzzah/Makefile b/sysutils/wuzzah/Makefile
index 675ece1bf27f..0fd383ff61d8 100644
--- a/sysutils/wuzzah/Makefile
+++ b/sysutils/wuzzah/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.53
 CATEGORIES=	sysutils
 MASTER_SITES=	http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line utility for stalking users
 
 GNU_CONFIGURE=	yes
diff --git a/textproc/colordiff/Makefile b/textproc/colordiff/Makefile
index 07ece3e68dc4..524f70f86f55 100644
--- a/textproc/colordiff/Makefile
+++ b/textproc/colordiff/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A tool to colorize diff output
 
 USE_PERL5=	yes
diff --git a/textproc/fldiff/Makefile b/textproc/fldiff/Makefile
index d56f39f31e9d..3c7d4acb53f0 100644
--- a/textproc/fldiff/Makefile
+++ b/textproc/fldiff/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://critical.ch/distfiles/ \
 		http://www.easysw.com/~mike/fldiff/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A graphical diff program using FLTK
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
diff --git a/textproc/htmlise/Makefile b/textproc/htmlise/Makefile
index db119bf02b05..5ff3515a5280 100644
--- a/textproc/htmlise/Makefile
+++ b/textproc/htmlise/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.ex-parrot.com/~chris/stuff/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Formats plain text as HTML
 
 USE_REINPLACE=	yes
diff --git a/textproc/rtf2html/Makefile b/textproc/rtf2html/Makefile
index c06ce20e1e42..8ce2e0912260 100644
--- a/textproc/rtf2html/Makefile
+++ b/textproc/rtf2html/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://www.45.free.net/~vitus/ice/misc/
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A simple rtf2html converter
 
 CFLAGS+=	-Wall -Werror
diff --git a/textproc/uni2ascii/Makefile b/textproc/uni2ascii/Makefile
index 24a7bded85bd..5ae9f496fc40 100644
--- a/textproc/uni2ascii/Makefile
+++ b/textproc/uni2ascii/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.5
 CATEGORIES=	textproc
 MASTER_SITES=	http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Convert between UTF-8 Unicode and 7-bit ASCII equivalents
 
 USE_LIBTOOL_VER=15
diff --git a/textproc/xlreader/Makefile b/textproc/xlreader/Makefile
index 7cb1b5259f08..704866c2290e 100644
--- a/textproc/xlreader/Makefile
+++ b/textproc/xlreader/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.giffin.org/download/ \
 		http://critical.ch/distfiles/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Convert .xls spread sheets to tab delimited CSV or SQL inserts
 
 USE_REINPLACE=	yes
diff --git a/www/bannerfilter/Makefile b/www/bannerfilter/Makefile
index db945468c222..8342a9535d5d 100644
--- a/www/bannerfilter/Makefile
+++ b/www/bannerfilter/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.31
 CATEGORIES=	www
 MASTER_SITES=	http://phroggy.com/files/unix/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A squid redirect script for filtering web banners
 
 RUN_DEPENDS=	squid:${PORTSDIR}/www/squid
diff --git a/www/linklint/Makefile b/www/linklint/Makefile
index 2e1e89c93fdc..eec749ac7783 100644
--- a/www/linklint/Makefile
+++ b/www/linklint/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.3.5
 CATEGORIES=	www
 MASTER_SITES=	http://www.linklint.org/download/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Perl script that checks links on web sites
 
 USE_PERL5_RUN=	yes
diff --git a/x11-clocks/lmclock/Makefile b/x11-clocks/lmclock/Makefile
index 46d666eb8f18..1163bd5f5ef3 100644
--- a/x11-clocks/lmclock/Makefile
+++ b/x11-clocks/lmclock/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://pantransit.reptiles.org/prog/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A Xerox Lisp machine clock clone
 
 USE_IMAKE=	yes
diff --git a/x11/gtk-launch/Makefile b/x11/gtk-launch/Makefile
index 36613f2c4066..dc8056c27536 100644
--- a/x11/gtk-launch/Makefile
+++ b/x11/gtk-launch/Makefile
@@ -10,7 +10,7 @@ DISTVERSION=	1.1b
 CATEGORIES=	x11
 MASTER_SITES=	http://pierric.descamps.free.fr/pierric/downloads/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A fast GTK+ program launcher
 
 USE_X_PREFIX=	yes
diff --git a/x11/thinglaunch/Makefile b/x11/thinglaunch/Makefile
index 07ea5df234ae..d6299cdb6b3e 100644
--- a/x11/thinglaunch/Makefile
+++ b/x11/thinglaunch/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.03
 CATEGORIES=	x11
 MASTER_SITES=	http://critical.ch/distfiles/
 
-MAINTAINER=	ehaupt@critical.ch
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A very fast launcher program for X
 
 USE_X_PREFIX=	yes