diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile
index da11f0a9ae9c..cb7bd074e09f 100644
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://members.chello.nl/~g.mast/distfiles/
 DISTNAME=	tremor_snapshot_${SNAP_DATE}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	kwm@rainbow-runner.nl
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Integer-only fully Ogg Vorbis compliant decoder library
 
 SNAP_DATE=	02132004
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index b6b13d30f742..e636d28c7b16 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gttr
 
-MAINTAINER=	kwm@rainbow-runner.nl
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GnoTime is a time tracker for gnome2
 
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile
index c13b3187ed34..420f15ecb2b4 100644
--- a/games/monster-masher/Makefile
+++ b/games/monster-masher/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.cs.aau.dk/~olau/monster-masher/source/
 PKGNAMESUFFIX=	-masher
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
-MAINTAINER=	kwm@rainbow-runner.nl
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Gnomemm puzzle game where you have to clean the caves of monsters
 
 LIB_DEPENDS=	gnomeuimm-2.0:${PORTSDIR}/x11-toolkits/libgnomeuimm
diff --git a/graphics/libtheora/Makefile b/graphics/libtheora/Makefile
index b91351984880..4cbd3bb98a7c 100644
--- a/graphics/libtheora/Makefile
+++ b/graphics/libtheora/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://www.theora.org/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a3/alpha3/}
 
-MAINTAINER=	kwm@rainbow-runner.nl
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Theora video codec for the Ogg multimedia streaming system
 
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index b91351984880..4cbd3bb98a7c 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://www.theora.org/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a3/alpha3/}
 
-MAINTAINER=	kwm@rainbow-runner.nl
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Theora video codec for the Ogg multimedia streaming system
 
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 911aabde2f47..2271312e13b2 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.gnomepro.com/tsclient/
 
-MAINTAINER=	kwm@rainbow-runner.nl
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	A GNOME 2 frontend for rdesktop and vncviewer
 
 RUN_DEPENDS=	rdesktop:${PORTSDIR}/net/rdesktop
diff --git a/www/bluefish-devel/Makefile b/www/bluefish-devel/Makefile
index 71f046c6d25b..23d7e03f7845 100644
--- a/www/bluefish-devel/Makefile
+++ b/www/bluefish-devel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://pkedu.fbt.eitn.wau.nl/~olivier/${DOWNLOAD}/ \
 		ftp://ftp.ratisbona.com/pub/bluefish/${DOWNLOAD}/ \
 		http://bluefish.shellhung.org/${DOWNLOAD}/
 
-MAINTAINER=	kwm@rainbow-runner.nl
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	HTML editor designed for the experienced web designer
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 1563b2a694a1..9ebe9ce040a2 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/ \
 		ftp://ftp.ratisbona.com/pub/bluefish/downloads/ \
 		http://bluefish.shellhung.org/downloads/
 
-MAINTAINER=	kwm@rainbow-runner.nl
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	HTML editor designed for the experienced web designer
 
 RUN_DEPENDS=	weblint:${PORTSDIR}/www/weblint
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 357b94306f79..edae298a3e0d 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	kwm@rainbow-runner.nl
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	A Gnome RSI prevention tool
 
 LIB_DEPENDS=	gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 \