diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 9b9a37630b2a..cb75f006c146 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	bitchx
 PORTVERSION=	1.2.1
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES+=	irc
 MASTER_SITES=	SF/${PORTNAME}/ircii-pana/${PORTNAME}-${DISTVERSION}
 
-MAINTAINER=	freebsd@bitchx.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Feature-rich scriptable IRC client
 WWW=		http://www.bitchx.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USES=		cpe gmake ncurses
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
 		--bindir="${PREFIX}/bin" \
 		--datadir="${PREFIX}/share" \
 		--libdir="${PREFIX}/share"
 
 CONFLICTS_INSTALL?=	zh-bitchx
 
 OPTIONS_SUB=	yes
 
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 DOCSDIR=	${PREFIX}/share/bx/help
 PORTDOCS=	*
 DATADIR=	${PREFIX}/share/bx
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS LANG_HE IPV6 LATIN PLUGINS SSL TOGGLES
 OPTIONS_DEFAULT=	PLUGINS SSL
 
 LATIN_DESC=	Recommended for ISO-8859-1 display
 PLUGINS_DESC=	Build a handful of BitchX plugins
 TOGGLES_DESC=	Disable annoyance toggles
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 SSL_CONFIGURE_WITH=	ssl="${OPENSSLBASE}"
 SSL_USES=		ssl
 
 PLUGINS_CONFIGURE_WITH=	plugins="${PLUGIN_LIST:C/\$$/,/g}"
 
 PLUGIN_LIST=	abot acro arcfour autocycle blowfish cavlink cdrom encrypt \
 		europa fserv hint nap nicklist pkga possum qbx qmail wavplay
 
 post-patch:
 	${REINPLACE_CMD} -e 's|bzip2|true|g' ${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's|SSLeay|ERR_get_error|' ${WRKSRC}/configure
 
 post-patch-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 post-patch-LATIN-on:
 	${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|' \
 		${WRKSRC}/include/config.h
 
 post-patch-LANG_HE-on:
 	${REINPLACE_CMD} -e 's|#undef WANT_HEBREW|#define WANT_HEBREW|' \
 		${WRKSRC}/include/config.h
 
 post-patch-TOGGLES-on:
 	${REINPLACE_CMD} -e 's|DEFAULT_AUTO_AWAY ON|DEFAULT_AUTO_AWAY OFF|' \
 		${WRKSRC}/include/config.h
 	${REINPLACE_CMD} -e 's|DEFAULT_KICK_OPS ON|DEFAULT_KICK_OPS OFF|' \
 		${WRKSRC}/include/config.h
 	${REINPLACE_CMD} -e 's|DEFAULT_AUTO_REJOIN ON|DEFAULT_AUTO_REJOIN OFF|' \
 		${WRKSRC}/include/config.h
 
 .include <bsd.port.mk>
diff --git a/irc/scrollz/Makefile b/irc/scrollz/Makefile
index f67dbc7f8ac1..e5471e688f63 100644
--- a/irc/scrollz/Makefile
+++ b/irc/scrollz/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	ScrollZ
 PORTVERSION=	2.3.1
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	irc
 
 # Fix build with clang
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	c0dfa140341cf9a848a6e5f926392623d03d2c28.patch:-p1
 
-MAINTAINER=	freebsd@bitchx.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhanced ircII client that supports scripts, colors, and more
 WWW=		https://www.scrollz.info/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USES=		gmake iconv ncurses
 USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
 
 DATADIR=	${PREFIX}/share/${PORTNAME:tl}
 PLIST_SUB=	SCROLLZ_VER="${PORTVERSION}"
 
 OPTIONS_DEFINE=		IPV6 REGEX UTF8
 OPTIONS_DEFAULT=	OPENSSL REGEX UTF8
 OPTIONS_RADIO=		SSL
 OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES=		pkgconfig
 GNUTLS_CONFIGURE_ON=	--with-ssl
 REGEX_CONFIGURE_ENABLE=	regexp
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 UTF8_CONFIGURE_ENABLE=	utf8
 
 .include <bsd.port.pre.mk>
 
 .if !empty(ICONV_LIB)
 CONFIGURE_ENV+=ac_cv_func_iconv_open=yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
 
 pre-build:
 .if !defined(BATCH)
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o SZdist \
 		SZdist.c)
 	@(cd ${WRKSRC} && ./SZdist)
 .endif
 
 post-install:
 .for i in scrollz-${PORTVERSION} wservz
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 
 .include <bsd.port.post.mk>