diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile
index a5bfe65699b1..b9033e4031a6 100644
--- a/editors/kakoune/Makefile
+++ b/editors/kakoune/Makefile
@@ -3,7 +3,7 @@ DISTVERSION=	2020.09.01
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/mawww/kakoune/releases/download/v${DISTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Modal code editor with a focus on interactivity
 
 LICENSE=	UNLICENSE
diff --git a/sysutils/lr/Makefile b/sysutils/lr/Makefile
index 4b7d947bb203..5068df63c5cc 100644
--- a/sysutils/lr/Makefile
+++ b/sysutils/lr/Makefile
@@ -6,7 +6,7 @@ DISTVERSION=	1.5.1
 PORTREVISION=	2
 CATEGORIES=	sysutils
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	List files, recursively
 
 LICENSE=	MIT
diff --git a/sysutils/pick/Makefile b/sysutils/pick/Makefile
index 08bfa5822f53..ecc1a202efd1 100644
--- a/sysutils/pick/Makefile
+++ b/sysutils/pick/Makefile
@@ -3,7 +3,7 @@ PORTVERSION=	4.0.0
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/mptre/pick/releases/download/v${PORTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Tool for choosing one option from a set of choices with an interface
 
 LICENSE=	MIT
diff --git a/sysutils/xe/Makefile b/sysutils/xe/Makefile
index c550d43958fb..8c5b516b08fb 100644
--- a/sysutils/xe/Makefile
+++ b/sysutils/xe/Makefile
@@ -5,7 +5,7 @@ DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11
 CATEGORIES=	sysutils
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Simple xargs and apply replacement
 
 LICENSE=	CC0-1.0
diff --git a/sysutils/yank/Makefile b/sysutils/yank/Makefile
index 7914e83012ee..a11d5d7692a8 100644
--- a/sysutils/yank/Makefile
+++ b/sysutils/yank/Makefile
@@ -3,7 +3,7 @@ DISTVERSION=	1.2.0
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/mptre/yank/releases/download/v${DISTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Yank terminal output to clipboard
 
 LICENSE=	MIT