Index: head/deskutils/note/Makefile
===================================================================
--- head/deskutils/note/Makefile
+++ head/deskutils/note/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	deskutils perl5
 MASTER_SITES=	http://www.daemon.de/idisk/Apps/note/
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	Console based tool to handle encrypted notes
 
 LICENSE=	GPLv1
Index: head/deskutils/py-khal/Makefile
===================================================================
--- head/deskutils/py-khal/Makefile
+++ head/deskutils/py-khal/Makefile
@@ -8,7 +8,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	CalDAV-based calendar
 
 LICENSE=	MIT
Index: head/deskutils/znotes/Makefile
===================================================================
--- head/deskutils/znotes/Makefile
+++ head/deskutils/znotes/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	deskutils
 PKGNAMESUFFIX=	-${FLAVOR}
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	Simple notes managment application based on Qt
 
 LICENSE=	GPLv3
Index: head/dns/py-adns/Makefile
===================================================================
--- head/dns/py-adns/Makefile
+++ head/dns/py-adns/Makefile
@@ -8,7 +8,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	Python module to resolve IPs to host names
 
 LICENSE=	GPLv2+
Index: head/net-p2p/py-tremc/Makefile
===================================================================
--- head/net-p2p/py-tremc/Makefile
+++ head/net-p2p/py-tremc/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	net-p2p python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	Console client for the BitTorrent client Transmission
 
 LICENSE=	GPLv3
Index: head/net-p2p/transmission-cli/Makefile
===================================================================
--- head/net-p2p/transmission-cli/Makefile
+++ head/net-p2p/transmission-cli/Makefile
@@ -6,7 +6,7 @@
 SLAVEPORT?=	cli
 PKGNAMESUFFIX?=	-cli
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	Meta-port for Transmission BitTorrent client
 
 LICENSE+=	MIT
Index: head/net-p2p/transmission/Makefile
===================================================================
--- head/net-p2p/transmission/Makefile
+++ head/net-p2p/transmission/Makefile
@@ -5,7 +5,7 @@
 PORTREVISION=	1
 CATEGORIES=	net-p2p
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	Meta-port for Transmission BitTorrent client
 
 LICENSE=	GPLv2+ MIT
Index: head/sysutils/powerdxx/Makefile
===================================================================
--- head/sysutils/powerdxx/Makefile
+++ head/sysutils/powerdxx/Makefile
@@ -4,7 +4,7 @@
 DISTVERSION=	0.3.0
 CATEGORIES=	sysutils
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	CPU clock speed/frequency daemon
 
 LICENSE=	ISCL
Index: head/textproc/py-sphinxcontrib-newsfeed/Makefile
===================================================================
--- head/textproc/py-sphinxcontrib-newsfeed/Makefile
+++ head/textproc/py-sphinxcontrib-newsfeed/Makefile
@@ -6,7 +6,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	News Feed extension for Sphinx
 
 LICENSE=	BSD2CLAUSE
Index: head/www/davical/Makefile
===================================================================
--- head/www/davical/Makefile
+++ head/www/davical/Makefile
@@ -6,7 +6,7 @@
 DISTVERSION=	1.1.7
 CATEGORIES?=	www
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	Simple CalDAV server using a postgres backend
 
 LICENSE=	GPLv2 LGPL21
Index: head/x11-fonts/ohsnap/Makefile
===================================================================
--- head/x11-fonts/ohsnap/Makefile
+++ head/x11-fonts/ohsnap/Makefile
@@ -5,7 +5,7 @@
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/osnapfont/
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	Monospaced font based on Artwiz Snap
 
 LICENSE=	GPLv2
Index: head/x11/admiral/Makefile
===================================================================
--- head/x11/admiral/Makefile
+++ head/x11/admiral/Makefile
@@ -7,7 +7,7 @@
 PORTREVISION=	1
 CATEGORIES=	x11
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	Merge concurrent outputs for a status bar
 
 LICENSE=	BSD2CLAUSE
Index: head/x11/polybar/Makefile
===================================================================
--- head/x11/polybar/Makefile
+++ head/x11/polybar/Makefile
@@ -4,7 +4,7 @@
 DISTVERSION=	3.2.1
 CATEGORIES=	x11
 
-MAINTAINER=	lebarondemerde@privacychain.ch
+MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	Fast and easy-to-use status bar
 
 LICENSE=	MIT