diff --git a/devel/gogs/Makefile b/devel/gogs/Makefile
--- a/devel/gogs/Makefile
+++ b/devel/gogs/Makefile
@@ -4,7 +4,7 @@
 PORTREVISION=	8
 CATEGORIES=	devel www
 
-MAINTAINER=	me@svmhdvn.name
+MAINTAINER=	siva@FreeBSD.org
 COMMENT=	Painless self-hosted Git service
 WWW=		https://gogs.io/
 
diff --git a/devel/p5-Escape-Houdini/Makefile b/devel/p5-Escape-Houdini/Makefile
--- a/devel/p5-Escape-Houdini/Makefile
+++ b/devel/p5-Escape-Houdini/Makefile
@@ -5,7 +5,7 @@
 MASTER_SITE_SUBDIR=	CPAN:YANICK
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	me@svmhdvn.name
+MAINTAINER=	siva@FreeBSD.org
 COMMENT=	Perl API to Houdini, a zero-dependency C web escaping library
 WWW=		https://metacpan.org/dist/Escape-Houdini
 
diff --git a/graphics/skia/Makefile b/graphics/skia/Makefile
--- a/graphics/skia/Makefile
+++ b/graphics/skia/Makefile
@@ -4,7 +4,7 @@
 PORTREVISION=	1
 CATEGORIES=	graphics
 
-MAINTAINER=	me@svmhdvn.name
+MAINTAINER=	siva@FreeBSD.org
 COMMENT=	Complete 2D graphic library for drawing Text, Geometries, and Images
 WWW=		https://skia.org/
 
diff --git a/irc/ngircd/Makefile b/irc/ngircd/Makefile
--- a/irc/ngircd/Makefile
+++ b/irc/ngircd/Makefile
@@ -7,7 +7,7 @@
 		https://ngircd.mirror.3rz.de/pub/ngircd/ \
 		https://ngircd.sourceforge.io/pub/ngircd/
 
-MAINTAINER=	me@svmhdvn.name
+MAINTAINER=	siva@FreeBSD.org
 COMMENT=	Free open source daemon for Internet Relay Chat (IRC)
 WWW=		https://ngircd.barton.de/
 
diff --git a/lang/trealla-prolog/Makefile b/lang/trealla-prolog/Makefile
--- a/lang/trealla-prolog/Makefile
+++ b/lang/trealla-prolog/Makefile
@@ -3,7 +3,7 @@
 DISTVERSION=	2.68.20
 CATEGORIES=	lang
 
-MAINTAINER=	me@svmhdvn.name
+MAINTAINER=	siva@FreeBSD.org
 COMMENT=	Compact, efficient Prolog interpreter written in plain-old C
 WWW=		https://github.com/trealla-prolog/trealla/
 
diff --git a/math/superlu/Makefile b/math/superlu/Makefile
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -3,7 +3,7 @@
 DISTVERSION=	7.0.1
 CATEGORIES=	math
 
-MAINTAINER=	me@svmhdvn.name
+MAINTAINER=	siva@FreeBSD.org
 COMMENT=	Library of routines for performing sparse factorization
 WWW=		https://portal.nersc.gov/project/sparse/superlu/
 
diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@@ -3,7 +3,7 @@
 CATEGORIES=	net
 MASTER_SITES=	SF
 
-MAINTAINER=	me@svmhdvn.name
+MAINTAINER=	siva@FreeBSD.org
 COMMENT=	Proxy/masquerading daemon for the SIP protocol
 WWW=		http://siproxd.sourceforge.net/
 
diff --git a/security/hockeypuck/Makefile b/security/hockeypuck/Makefile
--- a/security/hockeypuck/Makefile
+++ b/security/hockeypuck/Makefile
@@ -3,7 +3,7 @@
 PORTREVISION=	8
 CATEGORIES=	security
 
-MAINTAINER=	me@svmhdvn.name
+MAINTAINER=	siva@FreeBSD.org
 COMMENT=	Synchronizing Key Server, a fast OpenPGP keyserver
 WWW=		https://hockeypuck.github.io
 
diff --git a/security/py-k5test/Makefile b/security/py-k5test/Makefile
--- a/security/py-k5test/Makefile
+++ b/security/py-k5test/Makefile
@@ -4,7 +4,7 @@
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	me@svmhdvn.name
+MAINTAINER=	siva@FreeBSD.org
 COMMENT=	Library for setting up self-contained Kerberos 5 environments
 WWW=		https://github.com/pythongssapi/k5test
 
diff --git a/www/p5-Template-Mustache/Makefile b/www/p5-Template-Mustache/Makefile
--- a/www/p5-Template-Mustache/Makefile
+++ b/www/p5-Template-Mustache/Makefile
@@ -5,7 +5,7 @@
 MASTER_SITE_SUBDIR=	CPAN:PVANDE
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	me@svmhdvn.name
+MAINTAINER=	siva@FreeBSD.org
 COMMENT=	Perl version of the fabulous Mustache template language
 WWW=		https://metacpan.org/release/Template-Mustache