diff --git a/www/kannel-sqlbox/Makefile b/www/kannel-sqlbox/Makefile
index 55e49db33c40..0391b1f8f998 100644
--- a/www/kannel-sqlbox/Makefile
+++ b/www/kannel-sqlbox/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	kannel-sqlbox
 PORTVERSION=	1.0.1
 PORTREVISION=	9
 CATEGORIES=	www
 
-MAINTAINER=	dbaio@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 # Co-maintainer: Alberto Mijares <amijaresp@gmail.com> (PR/173889)
 COMMENT=	Add-on module for www/kannel (svn rev.55)
 WWW=		https://redmine.kannel.org/projects/kannel-sq-lbox
 
 LICENSE=	The_Kannel_Software_License
 LICENSE_NAME=	The Kannel Software License, Version 1.0
 LICENSE_FILE=	${WRKSRC}/KannelLICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 DEPRECATED=	Depends on EOL MySQL 5.7 (www/kannel)
 EXPIRATION_DATE=	2023-11-30
 
 BUILD_DEPENDS=	${LOCALBASE}/include/kannel/gw-config.h:www/kannel
 RUN_DEPENDS=	${LOCALBASE}/sbin/bearerbox:www/kannel
 LIB_DEPENDS=	libpcreposix.so:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dbaio
 
 USES=		gmake gnome iconv ssl
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
 
 OPTIONS_MULTI=	DATABASE
 OPTIONS_MULTI_DATABASE=	MYSQL PGSQL SQLITE3
 OPTIONS_DEFAULT=	MYSQL
 
 MYSQL_USES=	mysql
 
 PGSQL_USES=	pgsql
 
 SQLITE3_USES=	sqlite:3
 
 USE_RC_SUBR=	kannel_sqlbox
 SUB_FILES=	pkg-message
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/example/sqlbox.conf.example \
 	${STAGEDIR}${PREFIX}/etc/sqlbox.conf.sample
 .include <bsd.port.mk>
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index a368a831fb72..f6d4fe77874e 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	kannel
 PORTVERSION=	1.4.4
 PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.kannel.org/download/${PORTVERSION}/
 DISTNAME=	gateway-${PORTVERSION}
 
-MAINTAINER=	dbaio@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WAP/SMS gateway
 WWW=		http://www.kannel.org/
 
 LICENSE=	The_Kannel_Software_License
 LICENSE_NAME=	The Kannel Software License, Version 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 DEPRECATED=	Depends on EOL MySQL 5.7
 EXPIRATION_DATE=	2023-11-30
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 PORTSCOUT=	skipv:1.5.0
 
 USERS=		kannel
 GROUPS=		kannel
 
 USES=		cpe gmake gnome iconv ssl tar:bzip2
 USE_GCC=	yes
 USE_GNOME=	libxml2
 USE_RC_SUBR=	${PORTNAME}_bearerbox ${PORTNAME}_smsbox ${PORTNAME}_wapbox
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-pcre=yes --enable-docs=no --with-malloc=native \
 		--enable-start-stop-daemon=no
 CFLAGS+=	-fcommon
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3
 OPTIONS_DEFAULT=	MYSQL
 
 SQLITE3_USES=	sqlite:3
 SQLITE3_CONFIGURE_WITH=	sqlite3
 
 MYSQL_USES=	mysql
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_VARS=	IGNORE_WITH_MYSQL=80
 
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
 
 post-patch:
 	@${RM} ${WRKSRC}/wmlscript/wsgram.y
 
 post-install:
 .for filename in wapkannel.conf smskannel.conf
 	${INSTALL_DATA} ${WRKSRC}/gw/${filename} \
 		${STAGEDIR}${PREFIX}/etc/${filename}.sample
 .endfor
 .for filename in mtbatch seewbmp wmlsc wmlsdasm decode_emimsg
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${filename}
 .endfor
 .for filename in bearerbox run_kannel_box smsbox wapbox
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${filename}
 .endfor
 	@${MKDIR} ${STAGEDIR}/var/log/kannel
 	@${MKDIR} ${STAGEDIR}/var/run/kannel
 
 .include <bsd.port.mk>