Index: head/sysutils/lttng-tools/Makefile
===================================================================
--- head/sysutils/lttng-tools/Makefile	(revision 434001)
+++ head/sysutils/lttng-tools/Makefile	(revision 434002)
@@ -1,36 +1,36 @@
 # Created by: Mahdi Mokhtari <mokhi64@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	lttng-tools
 PORTVERSION=	2.9.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://lttng.org/files/${PORTNAME}/
 
-MAINTAINER=	mokhi64@gmail.com
+MAINTAINER=	mmokhi@FreeBSD.org
 COMMENT=	Set of tools to control LTTng tracing
 
 LICENSE=		LGPL21 GPLv2
 LICENSE_COMB=		dual
 LICENSE_FILE_LGPL21=	${WRKSRC}/lgpl-2.1.txt
 LICENSE_FILE_GPLv2=	${WRKSRC}/gpl-2.0.txt
 
 LIB_DEPENDS=	libpopt.so:devel/popt \
 	    liburcu.so:sysutils/liburcu \
 	    liblttng-ust-ctl.so:sysutils/lttng-ust
 
 USES=		autoreconf bison libtool localbase pathfix pkgconfig \
 	    shebangfix tar:bzip2
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=	--with-lttng-ust-prefix=${LOCALBASE} \
 	    --disable-maintainer-mode
 INSTALL_TARGET=		install-strip
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${STAGEDIR}${MANPREFIX}/man/man3/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${MANPREFIX}/man/man8/
 
 .include <bsd.port.mk>
Index: head/sysutils/lttng-ust/Makefile
===================================================================
--- head/sysutils/lttng-ust/Makefile	(revision 434001)
+++ head/sysutils/lttng-ust/Makefile	(revision 434002)
@@ -1,31 +1,31 @@
 # Created by: Mahdi Mokhtari <mokhi64@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	lttng-ust
 PORTVERSION=	2.9.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://lttng.org/files/${PORTNAME}/
 
-MAINTAINER=	mokhi64@gmail.com
+MAINTAINER=	mmokhi@FreeBSD.org
 COMMENT=	Libraries to instrument and trace user applications
 
 LICENSE=		LGPL21 MIT GPLv2
 LICENSE_COMB=		dual
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING
 LICENSE_FILE_MIT=	${WRKSRC}/COPYING
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liburcu.so:sysutils/liburcu
 
 USES=		autoreconf libtool localbase pathfix python \
 	    shebangfix tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g' \
 	    ${PATCH_WRKSRC}/tools/lttng-gen-tp
 
 .include <bsd.port.mk>