Index: head/devel/libconfuse/Makefile
===================================================================
--- head/devel/libconfuse/Makefile
+++ head/devel/libconfuse/Makefile
@@ -8,7 +8,7 @@
 MASTER_SITES=	https://github.com/libconfuse/libconfuse/releases/download/v${PORTVERSION}/
 DISTNAME=	confuse-${PORTVERSION}
 
-MAINTAINER=	juraj@lutter.sk
+MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Configuration file parsing library
 
 LICENSE=	ISCL
Index: head/games/powwow/Makefile
===================================================================
--- head/games/powwow/Makefile
+++ head/games/powwow/Makefile
@@ -7,7 +7,7 @@
 MASTER_SITES=	https://hoopajoo.net/static/projects/ \
 		https://ftp.sk.FreeBSD.org/pub/FreeBSD/local/distfiles/
 
-MAINTAINER=	juraj@lutter.sk
+MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Client to play MUDs
 
 LICENSE=	GPLv2
Index: head/mail/dovecot-fts-xapian/Makefile
===================================================================
--- head/mail/dovecot-fts-xapian/Makefile
+++ head/mail/dovecot-fts-xapian/Makefile
@@ -5,7 +5,7 @@
 CATEGORIES=	mail
 PKGNAMEPREFIX=	dovecot-
 
-MAINTAINER=	juraj@lutter.sk
+MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Dovecot FTS plugin based on Xapian
 
 LICENSE=	LGPL21
Index: head/net-mgmt/mdata-client/Makefile
===================================================================
--- head/net-mgmt/mdata-client/Makefile
+++ head/net-mgmt/mdata-client/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	20151001
 CATEGORIES=	net-mgmt
 
-MAINTAINER=	juraj@lutter.sk
+MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Metadata tools for use within guests of the SmartOS
 
 LICENSE=	MIT
Index: head/net-mgmt/py-pyzabbix/Makefile
===================================================================
--- head/net-mgmt/py-pyzabbix/Makefile
+++ head/net-mgmt/py-pyzabbix/Makefile
@@ -7,7 +7,7 @@
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	juraj@lutter.sk
+MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Zabbix API Python Library
 
 LICENSE=	LGPL21
Index: head/net-mgmt/triton-guesttools/Makefile
===================================================================
--- head/net-mgmt/triton-guesttools/Makefile
+++ head/net-mgmt/triton-guesttools/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	0.0.0.0s2017111501
 CATEGORIES=	net-mgmt
 
-MAINTAINER=	juraj@lutter.sk
+MAINTAINER=	otis@FreeBSD.org
 COMMENT=	FreeBSD guest tools for use with SmartOS
 
 RUN_DEPENDS=	bash:shells/bash \
Index: head/net-mgmt/unifi6/Makefile
===================================================================
--- head/net-mgmt/unifi6/Makefile
+++ head/net-mgmt/unifi6/Makefile
@@ -1,4 +1,4 @@
-# Created by: Juraj Lutter <juraj@lutter.sk>
+# Created by: Juraj Lutter <otis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	unifi6
@@ -13,7 +13,7 @@
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	unifi_sysvinit_all.deb
 
-MAINTAINER=	juraj@lutter.sk
+MAINTAINER=	otis@FreeBSD.org
 COMMENT=	UniFi Controller v6
 
 RUN_DEPENDS=	mongodb36>0:databases/mongodb36 \
Index: head/sysutils/tartarus/Makefile
===================================================================
--- head/sysutils/tartarus/Makefile
+++ head/sysutils/tartarus/Makefile
@@ -8,7 +8,7 @@
 MASTER_SITES=	http://wertarbyte.de/tartarus/ \
 		https://ftp.sk.FreeBSD.org/pub/FreeBSD/local/distfiles/
 
-MAINTAINER=	juraj@lutter.sk
+MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Wrappers around common Unix tools for simplified backup solution
 
 LICENSE=	GPLv3
Index: head/sysutils/virt-what/Makefile
===================================================================
--- head/sysutils/virt-what/Makefile
+++ head/sysutils/virt-what/Makefile
@@ -5,7 +5,7 @@
 CATEGORIES=	sysutils
 MASTER_SITES=	https://people.redhat.com/~rjones/virt-what/files/
 
-MAINTAINER=	juraj@lutter.sk
+MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Utility to determine whether it is being run in virtual environment
 
 LICENSE=	GPLv1
Index: head/textproc/py-jinja2-cli/Makefile
===================================================================
--- head/textproc/py-jinja2-cli/Makefile
+++ head/textproc/py-jinja2-cli/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=		textproc python
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=		juraj@lutter.sk
+MAINTAINER=		otis@FreeBSD.org
 COMMENT=		Jinja2 CLI tool
 
 LICENSE=		BSD2CLAUSE
Index: head/www/logswan/Makefile
===================================================================
--- head/www/logswan/Makefile
+++ head/www/logswan/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	2.1.8
 CATEGORIES=	www
 
-MAINTAINER=	juraj@lutter.sk
+MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Fast Web log analyzer
 
 LICENSE=	BSD2CLAUSE