Index: databases/p5-Store-CouchDB/Makefile
===================================================================
--- databases/p5-Store-CouchDB/Makefile
+++ databases/p5-Store-CouchDB/Makefile
@@ -7,7 +7,7 @@
 MASTER_SITE_SUBDIR=	CPAN:NORBU
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	dch@skunkwerks.at
+MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Perl interface to Apache CouchDB
 
 LICENSE=	ART10
Index: devel/py-structlog/Makefile
===================================================================
--- devel/py-structlog/Makefile
+++ devel/py-structlog/Makefile
@@ -1,4 +1,4 @@
-# Created by: Dave Cottlehuber <dch@skunkwerks.at>
+# Created by: Dave Cottlehuber <dch@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	structlog
@@ -7,7 +7,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	dch@skunkwerks.at
+MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Structured Logging for Python
 
 LICENSE=	APACHE20 MIT
Index: graphics/py-cairocffi/Makefile
===================================================================
--- graphics/py-cairocffi/Makefile
+++ graphics/py-cairocffi/Makefile
@@ -1,4 +1,4 @@
-# Created by: Dave Cottlehuber <dch@skunkwerks.at>
+# Created by: Dave Cottlehuber <dch@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cairocffi
@@ -8,7 +8,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	dch@skunkwerks.at
+MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Cairo cffi-based cairo bindings for Python
 
 LICENSE=	BSD3CLAUSE
Index: net-mgmt/riemann-c-client/Makefile
===================================================================
--- net-mgmt/riemann-c-client/Makefile
+++ net-mgmt/riemann-c-client/Makefile
@@ -1,4 +1,4 @@
-# Created by: Dave Cottlehuber <dch@skunkwerks.at>
+# Created by: Dave Cottlehuber <dch@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	riemann-c-client
@@ -7,7 +7,7 @@
 PORTREVISION=	2
 CATEGORIES=	net-mgmt
 
-MAINTAINER=	dch@skunkwerks.at
+MAINTAINER=	dch@FreeBSD.org
 COMMENT=	C library and command-line tool for Riemann
 
 LICENSE=	LGPL3+
Index: net-p2p/libswift/Makefile
===================================================================
--- net-p2p/libswift/Makefile
+++ net-p2p/libswift/Makefile
@@ -1,4 +1,4 @@
-# Created by: Dave Cottlehuber <dch@skunkwerks.at>
+# Created by: Dave Cottlehuber <dch@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=		libswift
@@ -6,7 +6,7 @@
 PORTREVISION=	2
 CATEGORIES=		net-p2p
 
-MAINTAINER=		dch@skunkwerks.at
+MAINTAINER=		dch@FreeBSD.org
 COMMENT=	IETF Peer-to-Peer Streaming Peer Protocol implementation
 
 LICENSE=	LGPL21
Index: sysutils/lava/Makefile
===================================================================
--- sysutils/lava/Makefile
+++ sysutils/lava/Makefile
@@ -1,11 +1,11 @@
-# Created by: Dave Cottlehuber <dch@skunkwerks.at>
+# Created by: Dave Cottlehuber <dch@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	lava
 PORTVERSION=	1.0.1
 CATEGORIES=	sysutils
 
-MAINTAINER=	dch@skunkwerks.at
+MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Keeps your CouchDB views molten hot
 
 LICENSE=	MIT
Index: sysutils/p5-Giovanni/Makefile
===================================================================
--- sysutils/p5-Giovanni/Makefile
+++ sysutils/p5-Giovanni/Makefile
@@ -7,7 +7,7 @@
 MASTER_SITE_SUBDIR=	CPAN:NORBU
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	dch@skunkwerks.at
+MAINTAINER=	dch@FreeBSD.org
 COMMENT=	PERL-based software deployment tool inspired by capistrano
 
 LICENSE=	ART10 GPLv1+
Index: x11-fonts/firacode/Makefile
===================================================================
--- x11-fonts/firacode/Makefile
+++ x11-fonts/firacode/Makefile
@@ -1,4 +1,4 @@
-# Created by: Dave Cottlehuber <dch@skunkwerks.at>
+# Created by: Dave Cottlehuber <dch@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	firacode
@@ -8,7 +8,7 @@
 MASTER_SITES=	https://github.com/tonsky/FiraCode/releases/download/${PORTVERSION}/
 DISTNAME=	FiraCode_${PORTVERSION}
 
-MAINTAINER=	dch@skunkwerks.at
+MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Monospaced font with programming ligatures derived from Fira
 
 LICENSE=	OFL11
Index: x11/urxvt-font-size/Makefile
===================================================================
--- x11/urxvt-font-size/Makefile
+++ x11/urxvt-font-size/Makefile
@@ -5,7 +5,7 @@
 DISTVERSION=	1.3
 CATEGORIES=	x11
 
-MAINTAINER=	dch@skunkwerks.at
+MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Perl extension for rxvt-unicode terminal emulator to change font size
 
 LICENSE=	MIT