51 files changed, 51 insertions, 51 deletions

diff --git a/accessibility/at-poke/Makefile b/accessibility/at-poke/Makefile
index c1426d208f31..8dbda0c32a55 100644
--- a/accessibility/at-poke/Makefile
+++ b/accessibility/at-poke/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Accessibility testing and poking tool
 
 USE_GMAKE=	yes
diff --git a/accessibility/py-papi/Makefile b/accessibility/py-papi/Makefile
index 5dacce955c17..4b960293d6f0 100644
--- a/accessibility/py-papi/Makefile
+++ b/accessibility/py-papi/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	accessibility devel python
 MASTER_SITES=	SF/ocemp
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	ATK accessibility wrapper for python
 
 USE_GNOME=	atk
diff --git a/audio/linux-f10-mikmod/Makefile b/audio/linux-f10-mikmod/Makefile
index c54f23a23b6b..230e13109c71 100644
--- a/audio/linux-f10-mikmod/Makefile
+++ b/audio/linux-f10-mikmod/Makefile
@@ -10,7 +10,7 @@ DISTVERSION=	3.1.6
 CATEGORIES=	audio linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-34
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	MikMod Sound Library (Linux version)
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/audio/linux-f10-sdl_mixer/Makefile b/audio/linux-f10-sdl_mixer/Makefile
index 538b885f041e..139e6300ae42 100644
--- a/audio/linux-f10-sdl_mixer/Makefile
+++ b/audio/linux-f10-sdl_mixer/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio linux
 MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 DISTNAME=	SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library (Linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
diff --git a/audio/linux-f8-mikmod/Makefile b/audio/linux-f8-mikmod/Makefile
index c54f23a23b6b..230e13109c71 100644
--- a/audio/linux-f8-mikmod/Makefile
+++ b/audio/linux-f8-mikmod/Makefile
@@ -10,7 +10,7 @@ DISTVERSION=	3.1.6
 CATEGORIES=	audio linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-34
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	MikMod Sound Library (Linux version)
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/audio/linux-f8-sdl_mixer/Makefile b/audio/linux-f8-sdl_mixer/Makefile
index 538b885f041e..139e6300ae42 100644
--- a/audio/linux-f8-sdl_mixer/Makefile
+++ b/audio/linux-f8-sdl_mixer/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio linux
 MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 DISTNAME=	SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library (Linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
diff --git a/audio/linux-mikmod/Makefile b/audio/linux-mikmod/Makefile
index c54f23a23b6b..230e13109c71 100644
--- a/audio/linux-mikmod/Makefile
+++ b/audio/linux-mikmod/Makefile
@@ -10,7 +10,7 @@ DISTVERSION=	3.1.6
 CATEGORIES=	audio linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-34
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	MikMod Sound Library (Linux version)
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/audio/linux-sdl_mixer/Makefile b/audio/linux-sdl_mixer/Makefile
index 538b885f041e..139e6300ae42 100644
--- a/audio/linux-sdl_mixer/Makefile
+++ b/audio/linux-sdl_mixer/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio linux
 MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 DISTNAME=	SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library (Linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index 79134a8cdd50..ba57baa2f082 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.6.372
 CATEGORIES=	audio
 MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A software implementation of the OpenAL specification
 
 CONFLICTS=	openal-200[0-9]*
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index b1fb1acb7a70..6648abbbc885 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library
 
 USE_AUTOTOOLS=	libtool:15
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index d031e81f6821..2dcfca07fc86 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://offload1.icculus.org:9090/SDL_sound/downloads/ \
 		http://offload2.icculus.org:9090/SDL_sound/downloads/
 DISTNAME=	SDL_sound-${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A SDL audio library and player for some popular sound file formats
 
 USE_AUTOTOOLS=	libtool:15
diff --git a/devel/cvs2cl/Makefile b/devel/cvs2cl/Makefile
index d481366ae02c..64e9940f13eb 100644
--- a/devel/cvs2cl/Makefile
+++ b/devel/cvs2cl/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.pl
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=	# none
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	CVS-log-message-to-ChangeLog conversion script
 
 USE_PERL5=	yes
diff --git a/devel/cvsutils/Makefile b/devel/cvsutils/Makefile
index 148c14246baf..62b2400da834 100644
--- a/devel/cvsutils/Makefile
+++ b/devel/cvsutils/Makefile
@@ -11,7 +11,7 @@ PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.red-bean.com/cvsutils/releases/
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	CVS utilities which facilitate working with local working directories
 
 USE_PERL5=	yes
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index ea593eb1ac32..36f239787e51 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.8.1
 CATEGORIES=	devel games
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A small, efficient C++ GUI library designed for games
 
 USE_AUTOTOOLS=	libtool:15
diff --git a/devel/py-astng/Makefile b/devel/py-astng/Makefile
index a1619fe01fae..089ad02faba3 100644
--- a/devel/py-astng/Makefile
+++ b/devel/py-astng/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.logilab.org/pub/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	logilab-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Extension for Python compiler.ast module
 
 RUN_DEPENDS=	${PYTHONPREFIX_SITELIBDIR}/logilab/__init__.py:${PORTSDIR}/devel/py-logilab-common
diff --git a/devel/py-dynrules/Makefile b/devel/py-dynrules/Makefile
index 376516bd8ddc..cbb1c994ce0e 100644
--- a/devel/py-dynrules/Makefile
+++ b/devel/py-dynrules/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	http://sysfault.org/projects/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Dynamic Scripting for adaptive AI systems
 
 USE_PYTHON=	yes
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 9f1446df3ef2..7b6484b00760 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://pygame.seul.org/ftp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}release
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A module designed to write games in Python
 
 LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg
diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile
index 5ee2f505c421..d03fe251c65d 100644
--- a/devel/py-logilab-common/Makefile
+++ b/devel/py-logilab-common/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.logilab.fr/pub/common/ \
 MASTER_SITE_SUBDIR=	dryice
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Common low-level libraries shared among logilab projects
 
 USE_PYTHON=	2.4+
diff --git a/devel/py-ocempgui/Makefile b/devel/py-ocempgui/Makefile
index e3b5bb31065c..acb587399574 100644
--- a/devel/py-ocempgui/Makefile
+++ b/devel/py-ocempgui/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	ocemp
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	OcempGUI-${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	GUI toolkit in python
 
 BUILD_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:${PORTSDIR}/devel/py-game
diff --git a/devel/py-ply/Makefile b/devel/py-ply/Makefile
index 55bb65ac681b..ea1280c1e832 100644
--- a/devel/py-ply/Makefile
+++ b/devel/py-ply/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	http://www.dabeaz.com/ply/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Python Lex-Yacc
 
 USE_PYTHON=	yes
diff --git a/devel/pychecker/Makefile b/devel/pychecker/Makefile
index 6aa80d26bc3e..1b19c29398e1 100644
--- a/devel/pychecker/Makefile
+++ b/devel/pychecker/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Python source code checking tool to help hunting common bugs
 
 USE_PYTHON=		yes
diff --git a/devel/pylint/Makefile b/devel/pylint/Makefile
index b55f8fb71dcb..bfbe329f50e1 100644
--- a/devel/pylint/Makefile
+++ b/devel/pylint/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.logilab.org/pub/pylint/	\
 		http://ftp.logilab.org/pub/pylint/
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Analyzes python source code looking for bugs and signs of poor quality
 
 RUN_DEPENDS=	${PYTHONPREFIX_SITELIBDIR}/logilab/astng/__init__.py:${PORTSDIR}/devel/py-astng
diff --git a/devel/pyrex/Makefile b/devel/pyrex/Makefile
index 6f46a103a158..fea3fa7c6218 100644
--- a/devel/pyrex/Makefile
+++ b/devel/pyrex/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
 PKGNAMEPREFIX=	${PYTHONPKGNAMEPREFIX}
 DISTNAME=	Pyrex-${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Programming Language for writing Python extension modules
 
 USE_PYTHON=	yes
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index b732c32a6258..52fb477a53f2 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
 DISTNAME=	SDL-${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Cross-platform multimedia development API
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
diff --git a/devel/winpdb/Makefile b/devel/winpdb/Makefile
index 5599671ecd58..09356df09172 100644
--- a/devel/winpdb/Makefile
+++ b/devel/winpdb/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MASTER_SITE_SUBDIR=	winpdb
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	An advanced Python debugger
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index d59a506b7b2a..d8f2b85d6052 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	editors
 MASTER_SITES=	SF
 DISTNAME=	ht-${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A file editor/viewer/analyzer for executables
 
 USE_BZIP2=	yes
diff --git a/games/HeroesOfMightAndMagic/Makefile b/games/HeroesOfMightAndMagic/Makefile
index 93d710d1a6cb..9e2cf11caf80 100644
--- a/games/HeroesOfMightAndMagic/Makefile
+++ b/games/HeroesOfMightAndMagic/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=
 DISTFILES=
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	BSD Installation of the Linux game "Heroes of Might and Magic III"
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
diff --git a/games/gish-demo/Makefile b/games/gish-demo/Makefile
index 992cc363566c..e18a5118af53 100644
--- a/games/gish-demo/Makefile
+++ b/games/gish-demo/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games linux
 MASTER_SITES=	http://s159260531.onlinehome.us/demos/
 DISTNAME=	gishdemo
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A platform game with a gelatinous 12-pound ball of tar named Gish (Demo version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
diff --git a/games/linux-candycruncher-demo/Makefile b/games/linux-candycruncher-demo/Makefile
index 3620d1619fc1..ce903084477f 100644
--- a/games/linux-candycruncher-demo/Makefile
+++ b/games/linux-candycruncher-demo/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	candycruncher_demo
 EXTRACT_SUFX=	.run
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Candy Cruncher Demo - a fast puzzle game with lots of candies
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/games/linux-coldwar-demo/Makefile b/games/linux-coldwar-demo/Makefile
index bbdc52bbd2d2..30dab75dba0e 100644
--- a/games/linux-coldwar-demo/Makefile
+++ b/games/linux-coldwar-demo/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	coldwar_demo
 EXTRACT_SUFX=	.run
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Coldwar Demo - a third-person sneaker like Splinter Cell
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/games/linux-darwinia-demo/Makefile b/games/linux-darwinia-demo/Makefile
index 94b27fb33c43..f5f87aba9253 100644
--- a/games/linux-darwinia-demo/Makefile
+++ b/games/linux-darwinia-demo/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}2-${PORTVERSION}
 EXTRACT_SUFX=	.sh
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Real-time action strategy with programs
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/games/linux-defcon/Makefile b/games/linux-defcon/Makefile
index 78d9edf47192..db007abcb920 100644
--- a/games/linux-defcon/Makefile
+++ b/games/linux-defcon/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://download.introversion.co.uk/defcon/linux/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Defcon for Linux
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/games/linux-gorky17-demo/Makefile b/games/linux-gorky17-demo/Makefile
index 98d5c5cc2d02..2169f79198f0 100644
--- a/games/linux-gorky17-demo/Makefile
+++ b/games/linux-gorky17-demo/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	gorky17_demo
 EXTRACT_SUFX=	.run
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Gorky17 Demo - a tactical shooter similiar to Jagged Alliance
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/games/linux-hdb-demo/Makefile b/games/linux-hdb-demo/Makefile
index 937a0bd088d0..49f71fcd9c9a 100644
--- a/games/linux-hdb-demo/Makefile
+++ b/games/linux-hdb-demo/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	hdb_demo
 EXTRACT_SUFX=	.run
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Hyperspace Delivery Boy Demo - deliver mail and packages
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/games/linux-majesty-demo/Makefile b/games/linux-majesty-demo/Makefile
index 14cb73320d00..cc7e77551517 100644
--- a/games/linux-majesty-demo/Makefile
+++ b/games/linux-majesty-demo/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	majesty_demo
 EXTRACT_SUFX=	.run
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Majesty Gold Demo
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/games/linux-ningpo-demo/Makefile b/games/linux-ningpo-demo/Makefile
index 43afb3f14d86..dd1b0abeb721 100644
--- a/games/linux-ningpo-demo/Makefile
+++ b/games/linux-ningpo-demo/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	ningpo_demo
 EXTRACT_SUFX=	.run
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	NingPo Mahjong Demo - a feature rich Mahjong game
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/games/linux-uplink-demo/Makefile b/games/linux-uplink-demo/Makefile
index c36e71933bc5..2d9c91308b7c 100644
--- a/games/linux-uplink-demo/Makefile
+++ b/games/linux-uplink-demo/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${PORTVERSION}DEMO
 EXTRACT_SUFX=	.sh
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	High tech computer crime and industrial espionage on the Internet
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/games/rt2-demo/Makefile b/games/rt2-demo/Makefile
index 7db66bd145d0..6e8ce226d1af 100644
--- a/games/rt2-demo/Makefile
+++ b/games/rt2-demo/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	rt2-demo
 EXTRACT_SUFX=	.run
 EXTRACT_ONLY=
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	The free demo of Railroad Tycoon II
 
 NO_WRKSUBDIR=	yes
diff --git a/games/tmw/Makefile b/games/tmw/Makefile
index aac2b68c38b4..b9377f372a09 100644
--- a/games/tmw/Makefile
+++ b/games/tmw/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	themanaworld
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A free open source 2D MMORPG in development
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index a3ff6a8e3ce9..b07f035be152 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
 		http://public.planetmirror.com/pub/blender/source/
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	3D modeling/rendering/animation/gaming package
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode
diff --git a/graphics/py-PyX/Makefile b/graphics/py-PyX/Makefile
index 833ffb19078b..9acb211d5fff 100644
--- a/graphics/py-PyX/Makefile
+++ b/graphics/py-PyX/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A Python package for the creation of encapsulated PostScript figures
 
 BUILD_DEPENDS=	kpsewhich:${PORTSDIR}/print/teTeX
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index 735688296019..96e0c57bc418 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.ferzkopp.net/Software/%SUBDIR%/ \
 MASTER_SITE_SUBDIR=	SDL_gfx-${PORTVERSION:R}
 DISTNAME=	SDL_gfx-${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	SDL graphics drawing primitives and other support functions
 
 USE_AUTOTOOLS=	libtool:15
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index a758e94b1e72..a44258f9e95a 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
 DISTNAME=	SDL_image-${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A simple library to load images of various formats as SDL surfaces
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 2f2e4b3411af..1abf4a55235a 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_ttf/release/
 DISTNAME=	SDL_ttf-${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A library to use TrueType fonts to render text in SDL applications
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
diff --git a/misc/diction/Makefile b/misc/diction/Makefile
index b25c847ae761..31ef86f2cd63 100644
--- a/misc/diction/Makefile
+++ b/misc/diction/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	GNU diction and style
 
 GNU_CONFIGURE=	yes
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index c022a872a0f6..ec52588f5b8a 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -16,7 +16,7 @@ DISTFILES=	${PORTNAME}-ui-${PORTVERSION}.tar.gz
 DISTFILES+=	${PORTNAME}-sound-${SOUNDV}.tar.gz
 .endif
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A language teaching program with sound
 
 LIB_DEPENDS=	lingoteach.3:${PORTSDIR}/textproc/liblingoteach
diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile
index 4f4ee0091db3..256f0cb18237 100644
--- a/net/sdl_net/Makefile
+++ b/net/sdl_net/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_net/release/
 DISTNAME=	SDL_net-${PORTVERSION}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A small sample cross-platform networking library
 
 USE_AUTOTOOLS=	libtool:15
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index c1af37819e04..3ab6362c2088 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A C-library for generating multi page PostScript documents
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/sysutils/flexbackup/Makefile b/sysutils/flexbackup/Makefile
index bc48c82f511d..b7f2bd4b3448 100644
--- a/sysutils/flexbackup/Makefile
+++ b/sysutils/flexbackup/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	http://www.edwinh.org/flexbackup/tarball/ \
 		http://www.reynoldsnet.org/flexbackup/tarball/
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Perl-based flexible backup system that can use dump/afio/cpio/tar/star
 
 # FreeBSD 6.0 removed gtar
diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index 4cb0a704a27c..40e8a770d020 100644
--- a/textproc/liblingoteach/Makefile
+++ b/textproc/liblingoteach/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lingoteach
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A library for parsing lesson files based on the LingoTeach DTD
 
 USE_AUTOTOOLS=	libtool:15
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index b0efad453d25..ebce7c6261a6 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.5.0
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://emelfm2.net/rel/
 
-MAINTAINER=	mva@sysfault.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	The gtk2 port of emelfm, a fast graphical filemanager
 
 USE_BZIP2=	yes