diff --git a/devel/p5-Thrift/Makefile b/devel/p5-Thrift/Makefile
index f6510c915571..681869f8f09a 100644
--- a/devel/p5-Thrift/Makefile
+++ b/devel/p5-Thrift/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	Thrift
 PORTVERSION=	${THRIFT_PORTVERSION}	# need to keep this in sync with ../thrift see ../thrift/bsd.thrift.mk
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 PKGNAMEPREFIX=	p5-
 DISTFILES=
 
-MAINTAINER=	komarov@valerka.net
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl interface to Thrift
 WWW=		https://thrift.apache.org/
 
 BUILD_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector
 RUN_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector
 FETCH_DEPENDS+=	${NONEXISTENT}:devel/thrift:extract
 
 USES=		cpe perl5
 USE_PERL5=	configure
 NO_ARCH=	yes
 CPE_VENDOR=	apache
 
 post-extract:
 	@${LN} -sfh \
 	`cd ${PORTSDIR}/devel/thrift && ${MAKE} -V WRKSRC`/lib/perl ${WRKSRC}
 
 .include "../thrift/bsd.thrift.mk"
 .include <bsd.port.mk>
diff --git a/devel/py-thrift/Makefile b/devel/py-thrift/Makefile
index f7bbd3353069..c1fa599bc266 100644
--- a/devel/py-thrift/Makefile
+++ b/devel/py-thrift/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	thrift
 PORTVERSION=	${THRIFT_PORTVERSION} # to keep in sync with thrift
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	APACHE/thrift/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	komarov@valerka.net
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python interface to Thrift
 WWW=		https://thrift.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../../LICENSE
 
 DISTINFO_FILE=	${PORTSDIR}/devel/thrift/distinfo
 
 USES=		cpe python
 CPE_VENDOR=	apache
 USE_PYTHON=	distutils autoplist
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/lib/py
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|setuptools|do_not_use_&|' ${WRKSRC}/${PYSETUP}
 
 .include "../thrift/bsd.thrift.mk"
 .include <bsd.port.mk>
diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile
index 98733d20a0c9..0ecfb5c497b6 100644
--- a/devel/thrift-cpp/Makefile
+++ b/devel/thrift-cpp/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	thrift
 PORTVERSION=	${THRIFT_PORTVERSION} # to keep in sync with thrift
 PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/thrift/${PORTVERSION}
 PKGNAMESUFFIX=	-cpp
 DISTNAME=	thrift-${PORTVERSION}
 
-MAINTAINER=	komarov@valerka.net
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ interface to Thrift
 WWW=		https://thrift.apache.org/
 
 BROKEN_i386=	undefined reference to 'boost::atomics::detail::lockpool::scoped_lock::scoped_lock(void const volatile*)'
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libevent.so:devel/libevent
 
 DISTINFO_FILE=		${.CURDIR}/../thrift/distinfo
 
 USES=			bison cmake pkgconfig compiler:c++11-lang cpe \
 			pathfix ssl
 CPE_VENDOR=		apache
 USE_LDCONFIG=		yes
 MAKE_JOBS_UNSAFE=	yes
 PLIST_SUB=		PORTVERSION="${THRIFT_PORTVERSION}"
 CMAKE_ON=	BUILD_CPP BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_C_GLIB BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 USE_CXXSTD=	c++11
 .endif
 
 .if ${SSL_DEFAULT} != base
 LDFLAGS+=	-L${OPENSSLLIB}
 CFLAGS+=	-I${OPENSSLINC}
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so
 	${LN} -sf libthrift-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthrift.so.0
 	${LN} -sf libthriftnb-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftnb.so.0
 	${LN} -sf libthriftz-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftz.so.0
 
 .include "../thrift/bsd.thrift.mk"
 .include <bsd.port.post.mk>
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index fe0eae0d8e74..5fe44425b4bf 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	thrift
 PORTVERSION=	${THRIFT_PORTVERSION}	# get these from bsd.thrift.mk. any upgrade needs to check ALL dependencies
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/thrift/${PORTVERSION}
 
-MAINTAINER=	komarov@valerka.net
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework for scalable cross-language services development
 WWW=		https://thrift.apache.org/
 
 LICENSE=	APACHE20
 
 USES=		bison cmake compiler:c++11-lang cpe pkgconfig
 CPE_VENDOR=	apache
 USE_LDCONFIG=	yes
 
 # For C++ support, use devel/thrift-cpp
 # For C glib support, use devel/thrift-c_glib.
 # For Perl support, use devel/p5-Thrift.
 # For Python support, use devel/py-thrift.
 # For Ruby support, use devel/rubygem-thrift.
 # For PHP support, use devel/php5-thrift.
 # For nodejs support, use devel/node-thrift.
 # Other languages are not yet supported, please feel free to contribute
 # using one of the leaf ports as an example.
 CMAKE_OFF=	BUILD_CPP BUILD_C_GLIB BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL
 
 .include <bsd.port.pre.mk>
 .include "bsd.thrift.mk"
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 post-patch:
 	@${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/compiler/cpp/Makefile.am \
 		${WRKSRC}/lib/rb/ext/extconf.rb
 
 pre-configure:
 	@${REINPLACE_CMD} '/config.h/d' ${WRKSRC}/lib/cpp/Makefile.am
 
 post-install:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "For use with C++, the same compiler as used to build this port must be used"
 	@${ECHO_MSG} "to compile and link your generated IDL bindings."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Note: The Thrift white paper may be downloaded from:"
 	@${ECHO_MSG} "http://thrift.apache.org/static/thrift-20070401.pdf"
 	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>