diff --git a/www/drupal7-wysiwyg/Makefile b/www/drupal7-wysiwyg/Makefile
index 7e42c55ae3f7..5de2b580db30 100644
--- a/www/drupal7-wysiwyg/Makefile
+++ b/www/drupal7-wysiwyg/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	wysiwyg
 DISTVERSION=	7.x-2.10
 CATEGORIES=	www
 
-MAINTAINER=	joneum@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows implementation of WYSIWYG editors for editing Drupal content
 WWW=		https://www.drupal.org/project/wysiwyg
 
 LICENSE=	GPLv2
 
 USES=		drupal:7,module
 
 MODULE_FILES=	editors/css/tinymce-3.css \
 		editors/css/tinymce-4.css \
 		editors/js/ckeditor-3.0.js \
 		editors/js/epiceditor.js \
 		editors/js/fckeditor-2.6.js \
 		editors/js/fckeditor.config.js \
 		editors/js/jwysiwyg.js \
 		editors/js/markitup.js \
 		editors/js/nicedit.js \
 		editors/js/none.js \
 		editors/js/tinymce-3.js \
 		editors/js/tinymce-4.js \
 		editors/js/whizzywig-56.js \
 		editors/js/whizzywig-60.js \
 		editors/js/whizzywig.js \
 		editors/js/wymeditor.js \
 		editors/ckeditor.inc \
 		editors/epiceditor.inc \
 		editors/fckeditor.inc \
 		editors/jwysiwyg.inc \
 		editors/markitup.inc \
 		editors/nicedit.inc \
 		editors/tinymce.inc \
 		editors/whizzywig.inc \
 		editors/wymeditor.inc \
 		wysiwyg-dialog-page.tpl.php \
 		wysiwyg.admin.inc \
 		wysiwyg.api.js \
 		wysiwyg.api.php \
 		wysiwyg.dialog.inc \
 		wysiwyg.features.inc \
 		wysiwyg.info \
 		wysiwyg.init.js \
 		wysiwyg.install \
 		wysiwyg.js \
 		wysiwyg.module \
 		plugins/break/images/break.gif \
 		plugins/break/images/breaktext.gif \
 		plugins/break/images/spacer.gif \
 		plugins/break/break.css \
 		plugins/break/break.js \
 		plugins/break/langs/ca.js \
 		plugins/break/langs/de.js \
 		plugins/break/langs/en.js \
 		plugins/break/langs/es.js \
 		plugins/break.inc
 
 MODULE_DIRS=	editors/css editors/js editors plugins/break/images \
 		plugins/break/langs plugins/break plugins
 
 DOC_FILES=	CHANGELOG.txt README.txt LICENSE.txt
 
 OPTIONS_DEFINE=	TINYMCE CKEDITOR DOCS
 
 CKEDITOR_DESC=	Install CKEditor
 CKEDITOR_RUN_DEPENDS=	ckeditor>0:www/ckeditor
 CKEDITOR_PLIST_FILES=	${DRUPAL_MODLIB}/ckeditor
 
 TINYMCE_DESC=	Install TinyMCE Editor
 TINYMCE_RUN_DEPENDS=	tinymce>0:www/tinymce
 TINYMCE_PLIST_FILES=	${DRUPAL_MODLIB}/tinymce
 
 post-install-TINYMCE-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${DRUPAL_MODLIB}
 	${LN} -fs ${PREFIX}/www/tinymce ${STAGEDIR}${PREFIX}/${DRUPAL_MODLIB}
 
 post-install-CKEDITOR-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${DRUPAL_MODLIB}
 	${LN} -fs ${PREFIX}/www/CKEditor ${STAGEDIR}${PREFIX}/${DRUPAL_MODLIB}/ckeditor
 
 .include <bsd.port.mk>
diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index edcc64bc9456..f1be7b9f1bde 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	drupal7
 DISTVERSION=	7.103
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.drupal.org/files/projects/
 DISTNAME=	drupal-${PORTVERSION}
 DIST_SUBDIR=	drupal
 
-MAINTAINER=	joneum@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Database driven web content management system (CMS)
 WWW=		https://www.drupal.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		drupal:7 php:web shebangfix
 USE_PHP=	dom filter gd mbstring pdo session simplexml xml
 
 SHEBANG_FILES=	scripts/password-hash.sh
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 DOCS=		CHANGELOG.txt INSTALL.mysql.txt INSTALL.sqlite.txt \
 		LICENSE.txt README.txt COPYRIGHT.txt INSTALL.pgsql.txt \
 		INSTALL.txt MAINTAINERS.txt UPGRADE.txt
 
 OPTIONS_DEFINE=		MYSQL SQLITE3 PGSQL DOCS
 OPTIONS_DEFAULT=	MYSQL
 
 SUB_FILES+=	pkg-message
 
 PGSQL_USES=	pgsql
 PGSQL_USE=	PHP=pdo_pgsql
 SQLITE3_USE=	PHP=pdo_sqlite
 MYSQL_USES=	mysql
 MYSQL_USE=	PHP=pdo_mysql
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DRUPAL_DIR}/sites/default/files
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} ".htaccess cron.php authorize.php \
 		includes index.php install.php misc modules profiles \
 		robots.txt scripts themes update.php web.config xmlrpc.php" \
 		${STAGEDIR}${DRUPAL_DIR})
 	(cd ${WRKSRC}/sites && ${COPYTREE_SHARE} "example.sites.php all" \
 		${STAGEDIR}${DRUPAL_DIR}/sites)
 	${INSTALL_DATA} ${WRKSRC}/sites/default/default.settings.php \
 		${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>