Index: head/archivers/libunrar/Makefile
===================================================================
--- head/archivers/libunrar/Makefile
+++ head/archivers/libunrar/Makefile
@@ -1,4 +1,4 @@
-# Created by: samm@os2.kiev.ua
+# Created by: samm@freebsd.org
 # $FreeBSD$
 
 PORTNAME=	libunrar
@@ -8,7 +8,7 @@
 MASTER_SITES=	http://www.rarlab.com/rar/
 DISTNAME=	unrarsrc-${PORTVERSION}
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Library to work with RAR archives
 
 WRKSRC=		${WRKDIR}/unrar
Index: head/archivers/qpress/Makefile
===================================================================
--- head/archivers/qpress/Makefile
+++ head/archivers/qpress/Makefile
@@ -1,4 +1,4 @@
-# Created by: Alex Samorukov <samm@os2.kiev.ua>
+# Created by: Alex Samorukov <samm@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	qpress
@@ -7,7 +7,7 @@
 MASTER_SITES=	http://www.quicklz.com/
 DISTNAME=	qpress-11-source
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Portable file archiver using QuickLZ
 
 LICENSE=	GPLv2
Index: head/comms/anyremote/Makefile
===================================================================
--- head/comms/anyremote/Makefile
+++ head/comms/anyremote/Makefile
@@ -1,4 +1,4 @@
-# Created by: Alex Samorukov <samm@os2.kiev.ua>
+# Created by: Alex Samorukov <samm@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	anyremote
@@ -6,7 +6,7 @@
 CATEGORIES=	comms
 MASTER_SITES=	SF
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Remote control service over Bluetooth, infrared, or TCP/IP networking
 
 LICENSE=	GPLv2
Index: head/comms/ebusd/Makefile
===================================================================
--- head/comms/ebusd/Makefile
+++ head/comms/ebusd/Makefile
@@ -5,7 +5,7 @@
 DISTVERSIONPREFIX=	v
 CATEGORIES=	comms
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Daemon for communication with eBUS heating systems
 
 LICENSE=	GPLv3
Index: head/converters/o3read/Makefile
===================================================================
--- head/converters/o3read/Makefile
+++ head/converters/o3read/Makefile
@@ -7,7 +7,7 @@
 MASTER_SITES=	http://siag.nu/pub/o3read/ \
 		GENTOO
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Standalone converter for the OpenOffice.org writer and scalc formats
 
 LICENSE=	GPLv2+
Index: head/databases/xtrabackup/Makefile
===================================================================
--- head/databases/xtrabackup/Makefile
+++ head/databases/xtrabackup/Makefile
@@ -1,4 +1,4 @@
-# Created by: Alex Samorukov <samm@os2.kiev.ua>
+# Created by: Alex Samorukov <samm@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	xtrabackup
@@ -9,7 +9,7 @@
 DISTFILES=	percona-${PORTNAME}-${PORTVERSION}.tar.gz:xtrabackup \
 		boost_1_59_0.tar.bz2:boost
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	OpenSource version of InnoDB backup with support of Percona extensions
 
 LICENSE=	GPLv2
Index: head/dns/inadyn/Makefile
===================================================================
--- head/dns/inadyn/Makefile
+++ head/dns/inadyn/Makefile
@@ -1,4 +1,4 @@
-# Created by: Alex Samorukov <samm@os2.kiev.ua>
+# Created by: Alex Samorukov <samm@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	inadyn
@@ -9,7 +9,7 @@
 		LOCAL/dhn
 DISTNAME=	${PORTNAME}.v${PORTVERSION}
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Dynamic DNS update client
 
 USES=		dos2unix gmake zip
Index: head/net-mgmt/flowviewer/Makefile
===================================================================
--- head/net-mgmt/flowviewer/Makefile
+++ head/net-mgmt/flowviewer/Makefile
@@ -1,4 +1,4 @@
-# Created by: Alex Samorukov, samm@os2.kiev.ua
+# Created by: Alex Samorukov, samm@freebsd.org
 # $FreeBSD$
 
 PORTNAME=	flowviewer
@@ -9,7 +9,7 @@
 DISTNAME=	FlowViewer_${DISTVERSION}
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Web-based user interface for the flow-tools NetFlow data
 
 RUN_DEPENDS=	p5-GD-Graph>=0:graphics/p5-GD-Graph \
Index: head/security/acmetool/Makefile
===================================================================
--- head/security/acmetool/Makefile
+++ head/security/acmetool/Makefile
@@ -5,7 +5,7 @@
 DISTVERSION=	0.0.67
 CATEGORIES=	security
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	CLI tool for automatically acquiring certificates from ACME servers
 
 LICENSE=	MIT
Index: head/security/stoken/Makefile
===================================================================
--- head/security/stoken/Makefile
+++ head/security/stoken/Makefile
@@ -1,4 +1,4 @@
-# Created by: Alex Samorukov <samm@os2.kiev.ua>
+# Created by: Alex Samorukov <samm@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	stoken
@@ -6,7 +6,7 @@
 CATEGORIES=	security
 MASTER_SITES=	SF/stoken
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Software Token for UNIX compatible with RSA SecurID
 
 LICENSE=	LGPL21
Index: head/sysutils/atop/Makefile
===================================================================
--- head/sysutils/atop/Makefile
+++ head/sysutils/atop/Makefile
@@ -1,4 +1,4 @@
-# Created by: Alex Samorukov <samm@os2.kiev.ua>
+# Created by: Alex Samorukov <samm@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	atop
@@ -6,7 +6,7 @@
 PORTREVISION=	2
 CATEGORIES=	sysutils
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	ASCII Monitor for system resources and process activity
 
 LICENSE=	GPLv2
Index: head/sysutils/busybox/Makefile
===================================================================
--- head/sysutils/busybox/Makefile
+++ head/sysutils/busybox/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	sysutils misc shells
 MASTER_SITES=	https://busybox.net/downloads/
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Set of common utilities built as single binary
 
 LICENSE=	GPLv2
Index: head/sysutils/exfat-utils/Makefile
===================================================================
--- head/sysutils/exfat-utils/Makefile
+++ head/sysutils/exfat-utils/Makefile
@@ -1,4 +1,4 @@
-# Created by: Alex Samorukov <samm@os2.kiev.ua>
+# Created by: Alex Samorukov <samm@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	exfat
@@ -7,7 +7,7 @@
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-utils
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Utilities to create, check, label and dump exFAT filesystem
 
 LICENSE=	GPLv2+ MSPAT
Index: head/sysutils/fusefs-exfat/Makefile
===================================================================
--- head/sysutils/fusefs-exfat/Makefile
+++ head/sysutils/fusefs-exfat/Makefile
@@ -1,4 +1,4 @@
-# Created by: Alex Samorukov <samm@os2.kiev.ua>
+# Created by: Alex Samorukov <samm@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	exfat
@@ -7,7 +7,7 @@
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	fusefs-
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Full-featured exFAT FS implementation as a FUSE module
 
 LICENSE=	GPLv2+ MSPAT
Index: head/sysutils/smartmontools/Makefile
===================================================================
--- head/sysutils/smartmontools/Makefile
+++ head/sysutils/smartmontools/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	S.M.A.R.T. disk monitoring tools
 
 LICENSE=	GPLv2+
Index: head/sysutils/ssync/Makefile
===================================================================
--- head/sysutils/ssync/Makefile
+++ head/sysutils/ssync/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	sysutils
 MASTER_SITES=	http://linuxfocus.org/~guido/
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@freebsd.org
 COMMENT=	Minimalistic tool for keeping filesystems in synchronization
 
 USES=		gmake