diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
index 9a38ef6569fd2..47ee9815e2922 100644
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	databases java
 MASTER_SITES=
 DIST_SUBDIR=	oracle
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Graphical tool for database development
 WWW=		https://www.oracle.com/database/technologies/appdev/sqldeveloper-landing.html
 
diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile
index d731dd29702da..a384e7b4e8fb8 100644
--- a/games/ezquake/Makefile
+++ b/games/ezquake/Makefile
@@ -9,7 +9,7 @@ DISTFILES=	${PORTVERSION}.tar.gz \
 		${PORTNAME}-ubuntu-${PORTVERSION}-full.tar.gz
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Modern QuakeWorld client
 WWW=		https://www.ezquake.com/
 
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 3a37679fb9000..d4ecda8fcc3ef 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	14
 CATEGORIES=	graphics
 MASTER_SITES=	https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	API for accessing scanners, digital cameras, frame grabbers, etc
 WWW=		http://www.sane-project.org/
 
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 7d3d6b3a0c286..c23d180120f33 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	multimedia
 MASTER_SITES=	http://lives-video.com/releases/
 DISTNAME=	LiVES-${PORTVERSION}
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Video editing system
 WWW=		http://lives-video.com/
 
diff --git a/multimedia/smplayer-skins/Makefile b/multimedia/smplayer-skins/Makefile
index f6b305cb29ae9..93cc93abe3423 100644
--- a/multimedia/smplayer-skins/Makefile
+++ b/multimedia/smplayer-skins/Makefile
@@ -5,7 +5,7 @@ PORTEPOCH=	1
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	SF/smplayer/SMPlayer-skins/${PORTVERSION}
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Skins for SMPlayer (Skinnable GUI)
 WWW=		http://smplayer.sourceforge.net/
 
diff --git a/multimedia/smplayer-themes/Makefile b/multimedia/smplayer-themes/Makefile
index 38b94dc25bbc4..d847f8cd96d2c 100644
--- a/multimedia/smplayer-themes/Makefile
+++ b/multimedia/smplayer-themes/Makefile
@@ -5,7 +5,7 @@ PORTEPOCH=	1
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	SF/smplayer/SMPlayer-themes/${PORTVERSION}/
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Themes for SMPlayer
 WWW=		http://smplayer.sourceforge.net/
 
diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index c1dcd75b7d98e..6e9f4d544fdda 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	1
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	SF/${PORTNAME}/SMPlayer/${PORTVERSION}
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Complete front-end based on Qt for mplayer
 WWW=		https://www.smplayer.info/
 
diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile
index 67d7f6451f662..19d11a35f8c24 100644
--- a/multimedia/smtube/Makefile
+++ b/multimedia/smtube/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/smtube/SMTube/${PORTVERSION}/
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	SMPlayer YouTube browser
 WWW=		https://www.smtube.org/
 
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 8fc1b3522c266..30116a5e694eb 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	https://pub.freerdp.com/releases/ \
 PATCH_SITES=	https://github.com/FreeRDP/FreeRDP/commit/
 PATCHFILES+=	498ddbf23e520fbff6c96a3c4bd4c6b2534529c4.patch:-p1 # Disable sha3 and shake hashes for libressl
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Free implementation of Remote Desktop Protocol
 WWW=		https://www.freerdp.com/
 
diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index 40e6121132755..a5c8a7ca83043 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v
 PKGNAMESUFFIX=	-devel
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 10.1.x branch
 WWW=		https://tomcat.apache.org/
 
diff --git a/www/tomcat10/Makefile b/www/tomcat10/Makefile
index aec6941717dc9..ed1782eca1c8b 100644
--- a/www/tomcat10/Makefile
+++ b/www/tomcat10/Makefile
@@ -8,7 +8,7 @@ DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 DEPRECATED=	EOLd, potential security issues (https://tomcat.apache.org/tomcat-10.0-eol.html), use www/tomcat101 instead
 EXPIRATION_DATE=2023-06-30
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 10.0.x branch
 WWW=		https://tomcat.apache.org/
 
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile
index a7916aa27c007..c2fa72c6aeb55 100644
--- a/www/tomcat101/Makefile
+++ b/www/tomcat101/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v
 PKGNAMESUFFIX=	101
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 10.1.x branch
 WWW=		https://tomcat.apache.org/
 
diff --git a/www/tomcat85/Makefile b/www/tomcat85/Makefile
index c433e852c7f1c..13eb77224dbc9 100644
--- a/www/tomcat85/Makefile
+++ b/www/tomcat85/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v$
 PKGNAMESUFFIX=	85
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 8.5.x branch
 WWW=		https://tomcat.apache.org/
 
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index edb72a19313f7..93a6ee8a55348 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v$
 PKGNAMESUFFIX=	9
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 9.0.x branch
 WWW=		https://tomcat.apache.org/