diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 8dfab25275a4..043ffd5aded4 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	gnupg
 PORTVERSION=	2.3.3
 PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
-MAINTAINER=	adamw@FreeBSD.org
+MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Complete and free PGP implementation
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPL3
 
 LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libksba.so:security/libksba \
 		libnpth.so:devel/npth
 RUN_DEPENDS=	pinentry:security/pinentry
 
 USES=		compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite tar:bzip2
 
 CONFLICTS=	gnupg-2.0.* dirmngr
 CPE_VENDOR=	gnupg
 
 CONFIGURE_ARGS=	--disable-ntbtls --enable-gpg-is-gpg2 --enable-symcryptrun
 GNU_CONFIGURE=	yes
 INFO=		gnupg
 TEST_TARGET=	check
 TEST_ARGS=	TESTARGS=--parallel
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS GNUTLS LARGE_RSA LDAP NLS SCDAEMON SUID_GPG WKS_SERVER
 OPTIONS_DEFAULT=GNUTLS SCDAEMON WKS_SERVER
 OPTIONS_SUB=	yes
 
 LARGE_RSA_DESC=	Enable support for 8192-bit RSA keys
 LDAP_DESC=	LDAP keyserver interface
 SCDAEMON_DESC=	Enable Smartcard daemon (with libusb)
 SUID_GPG_DESC=	Install GPG as SUID root
 WKS_SERVER_DESC=Install the Web Key Service server
 
 GNUTLS_CONFIGURE_ENABLE=gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 LARGE_RSA_CONFIGURE_ENABLE=	large-secmem
 
 LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
 LDAP_LIBS=		-L${LOCALBASE}/lib
 LDAP_USE=		OPENLDAP=yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 SCDAEMON_CONFIGURE_ENABLE=	scdaemon
 
 WKS_SERVER_CONFIGURE_ENABLE=	wks-tools
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNUTLS} && ${PORT_OPTIONS:MLDAP}
 PLIST_SUB+=	DIRMNGRLDAP=""
 .else
 PLIST_SUB+=	DIRMNGRLDAP="@comment "
 .endif
 
 # Touch the texinfo files to force makeinfo to run.  This fixes Linuxisms in
 # the paths in the man pages.
 pre-build:
 	${TOUCH} ${WRKSRC}/doc/*.texi
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/gpgsplit ${STAGEDIR}${PREFIX}/bin/gpgsplit2
 	${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR}
 
 # Necessary because of --enable-gpg-is-gpg2
 pre-test:
 	${LN} -s gpg ${WRKSRC}/bin/gpg2
 
 .include <bsd.port.mk>
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 9fe219b39a5d..7579857b59f3 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	gnupg
 PORTVERSION=	1.4.23
 PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 PKGNAMESUFFIX=	1
 
-MAINTAINER=	adamw@FreeBSD.org
+MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	The GNU Privacy Guard (minimalist "classic" version)
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CPE_VENDOR=	gnupg
 
 USES=		charsetfix compiler cpe gmake readline tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-camellia \
 		--enable-noexecstack
 CFLAGS+=	-fcommon
 
 INFO=		gnupg1
 DOCSDIR=	${PREFIX}/share/doc/gnupg1
 PORTDOCS=	*
 
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	CURL DOCS LDAP ICONV LIBUSB NLS SUID_GPG
 OPTIONS_DEFAULT=CURL
 OPTIONS_SUB=	yes
 
 CURL_DESC=	Use libcurl for the keyserver interface
 LDAP_DESC=	LDAP keyserver interface
 LIBUSB_DESC=	Support for USB smart cards
 SUID_GPG_DESC=	Install GPG setuid
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl=${LOCALBASE}
 # Work around a GnuPG configure buglet
 CURL_CONFIGURE_ENV=	_libcurl_config=${LOCALBASE}/bin/curl-config
 
 ICONV_USES=		iconv
 ICONV_CONFIGURE_ENABLE=	gnupg-iconv
 
 LIBUSB_CONFIGURE_WITH=	libusb=${LOCALBASE}
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386" && ${COMPILER_TYPE} == "clang"
 CFLAGS+=	-fheinous-gnu-extensions
 .elif ${ARCH} == powerpc
 USE_GCC=	yes
 .endif
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in doc/DETAILS doc/FAQ doc/HACKING doc/OpenPGP \
 	ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \
 	README THANKS TODO VERSION
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>