diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile
index a5bfe65699b1..b9033e4031a6 100644
--- a/editors/kakoune/Makefile
+++ b/editors/kakoune/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	kakoune
 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
 LICENSE_FILE=	${WRKSRC:H}/UNLICENSE
 
 RUN_DEPENDS=	setsid:sysutils/ssid
 
 USES=		compiler:c++17-lang gmake ncurses tar:bzip2
 DATADIR=	${PREFIX}/share/kak
 DOCSDIR=	${PREFIX}/share/doc/kak
 PATCH_WRKSRC=	${WRKSRC:H}
 WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFINE=	DEBUG DOCS
 
 DEBUG_MAKE_ARGS=	debug=yes
 DEBUG_MAKE_ARGS_OFF=	debug=no
 
 post-patch:
 	@${REINPLACE_CMD} -e '/-O3/d' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/kak
 
 do-test:
 	@cd ${WRKSRC:H}/test && ${SETENV} LC_ALL=en_US.UTF-8 ./run
 
 .include <bsd.port.mk>
diff --git a/sysutils/lr/Makefile b/sysutils/lr/Makefile
index 4b7d947bb203..5068df63c5cc 100644
--- a/sysutils/lr/Makefile
+++ b/sysutils/lr/Makefile
@@ -1,60 +1,60 @@
 # Created by: Tobias Kortkamp <t@tobik.me>
 
 PORTNAME=	lr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
 PORTREVISION=	2
 CATEGORIES=	sysutils
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	List files, recursively
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	leahneukirchen
 
 MAKE_ARGS=	CFLAGS="${CFLAGS}" \
 		PREFIX="${PREFIX}" \
 		MANDIR="${PREFIX}/man"
 
 OPTIONS_DEFINE=		CONTRIB EMACS NEOVIM VIM
 OPTIONS_DEFAULT=	CONTRIB EMACS NEOVIM VIM
 OPTIONS_SUB=	yes
 
 CONTRIB_DESC=	Contrib scripts
 EMACS_DESC=	Emacs plugin
 NEOVIM_DESC=	Neovim plugin
 VIM_DESC=	Vim plugin
 
 CONTRIB_RUN_DEPENDS=	xe:sysutils/xe
 
 EMACS_USES=	emacs
 EMACS_VARS=	EMACS_NO_DEPENDS=yes
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lr
 
 post-install-CONTRIB-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/lrls \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/lrocate \
 		${STAGEDIR}${PREFIX}/bin
 
 post-install-EMACS-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/lr.el \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/lr.el
 
 post-install-VIM-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles/plugin
 	${INSTALL_DATA} ${WRKSRC}/contrib/lr.vim \
 		${STAGEDIR}${PREFIX}/share/vim/vimfiles/plugin/
 
 post-install-NEOVIM-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/nvim/runtime/plugin
 	${INSTALL_DATA} ${WRKSRC}/contrib/lr.vim \
 		${STAGEDIR}${PREFIX}/share/nvim/runtime/plugin/
 
 .include <bsd.port.mk>
diff --git a/sysutils/pick/Makefile b/sysutils/pick/Makefile
index 08bfa5822f53..ecc1a202efd1 100644
--- a/sysutils/pick/Makefile
+++ b/sysutils/pick/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	pick
 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
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		ncurses
 HAS_CONFIGURE=	yes
 MAKE_ARGS=	INSTALL="${INSTALL_PROGRAM}"
 PLIST_FILES=	bin/pick \
 		man/man1/pick.1.gz
 
 .include <bsd.port.mk>
diff --git a/sysutils/xe/Makefile b/sysutils/xe/Makefile
index c550d43958fb..8c5b516b08fb 100644
--- a/sysutils/xe/Makefile
+++ b/sysutils/xe/Makefile
@@ -1,31 +1,31 @@
 # Created by: Tobias Kortkamp <t@tobik.me>
 
 PORTNAME=	xe
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	leahneukirchen
 
 USES=		perl5
 USE_PERL5=	test
 
 MAKE_ARGS=	CFLAGS="${CFLAGS}" \
 		PREFIX="${PREFIX}" \
 		MANDIR="${PREFIX}/man"
 TEST_TARGET=	check
 
 PLIST_FILES=	bin/xe \
 		man/man1/xe.1.gz \
 		share/zsh/site-functions/_xe
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xe
 
 .include <bsd.port.mk>
diff --git a/sysutils/yank/Makefile b/sysutils/yank/Makefile
index 7914e83012ee..a11d5d7692a8 100644
--- a/sysutils/yank/Makefile
+++ b/sysutils/yank/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	yank
 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
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 MAKE_ARGS=	MANPREFIX=${PREFIX}/man PREFIX=${PREFIX}
 PLIST_FILES=	bin/yank \
 		man/man1/yank.1.gz
 
 OPTIONS_DEFINE=	X11
 
 X11_RUN_DEPENDS=	xsel-conrad>=0:x11/xsel-conrad
 
 .include <bsd.port.mk>