Index: head/textproc/elasticsearch-plugin-head/Makefile
===================================================================
--- head/textproc/elasticsearch-plugin-head/Makefile	(revision 466960)
+++ head/textproc/elasticsearch-plugin-head/Makefile	(revision 466961)
@@ -1,25 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	head
 PORTVERSION=	2015.12.16
 CATEGORIES=	textproc
 PKGNAMEPREFIX=	elasticsearch-plugin-
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	ElasticSearch Head Plugin
 
 LICENSE=	APACHE20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mobz
 GH_PROJECT=	elasticsearch-head
 GH_TAGNAME=	8fe463f
 
 NO_BUILD=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/head
 	cd ${WRKSRC} && ${COPYTREE_SHARE} _site ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/head
 	${INSTALL_DATA} ${WRKSRC}/*.properties ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/head
 
 .include <bsd.port.mk>
Index: head/textproc/elasticsearch2-plugin-hq/Makefile
===================================================================
--- head/textproc/elasticsearch2-plugin-hq/Makefile	(revision 466960)
+++ head/textproc/elasticsearch2-plugin-hq/Makefile	(revision 466961)
@@ -1,30 +1,30 @@
 # $FreeBSD$
 
 PORTNAME=	hq
 PORTVERSION=	2.0.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 PKGNAMEPREFIX=	elasticsearch2-plugin-
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	ElasticSearch HQ Plugin
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	elasticsearch2>=2.0.0:textproc/elasticsearch2
 
 CONFLICTS=	elasticsearch-plugin-hq-1.*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	royrusso
 GH_PROJECT=	elasticsearch-HQ
 NO_ARCH=	yes
 
 NO_BUILD=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/HQ
 	cd ${WRKSRC} && ${COPYTREE_SHARE} _site ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/HQ
 	${INSTALL_DATA} ${WRKSRC}/*.properties ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/HQ
 
 .include <bsd.port.mk>
Index: head/textproc/elasticsearch2-plugin-migration/Makefile
===================================================================
--- head/textproc/elasticsearch2-plugin-migration/Makefile	(revision 466960)
+++ head/textproc/elasticsearch2-plugin-migration/Makefile	(revision 466961)
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	migration
 PORTVERSION=	2.0.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 PKGNAMEPREFIX=	elasticsearch2-plugin-
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	ElasticSearch Migration Plugin
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	elasticsearch2>=2.3.0:textproc/elasticsearch2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
 GH_PROJECT=	elasticsearch-migration
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/migration
 	cd ${WRKSRC} && ${COPYTREE_SHARE} _site ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/migration
 	${INSTALL_DATA} ${WRKSRC}/*.properties ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/migration
 
 .include <bsd.port.mk>
Index: head/textproc/elasticsearch2-plugin-sql/Makefile
===================================================================
--- head/textproc/elasticsearch2-plugin-sql/Makefile	(revision 466960)
+++ head/textproc/elasticsearch2-plugin-sql/Makefile	(revision 466961)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	sql
 PORTVERSION=	2.4.6.0
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/NLPchina/elasticsearch-sql/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	elasticsearch2-plugin-
 DISTNAME=	elasticsearch-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	ElasticSearch SQL plugin
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	elasticsearch2>=2.4.6:textproc/elasticsearch2
 
 CONFLICTS=	elasticsearch-plugin-sql-1.*
 
 USES=		zip
 NO_BUILD=	yes
 NO_ARCH=	yes
 PLIST_SUB+=	VERSION="${PORTVERSION}"
 
 post-patch:
 	@${FIND} ${WRKSRC} -type d -empty -delete
 	@${RM} ${WRKSRC}/_site/vendor/codemirror/.travis.yml
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/sql
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/sql
 	cd ${WRKSRC} && ${COPYTREE_SHARE} _site ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/sql
 	${INSTALL_DATA} ${WRKSRC}/*.properties ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/sql
 
 .include <bsd.port.mk>