diff --git a/devel/shfmt/Makefile b/devel/shfmt/Makefile
index e96dfca90887..adfb5ae12096 100644
--- a/devel/shfmt/Makefile
+++ b/devel/shfmt/Makefile
@@ -1,30 +1,30 @@
 # $FreeBSD$
 
 PORTNAME=	shfmt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.2
 CATEGORIES=	devel
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Format shell scripts
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	mvdan
 GH_PROJECT=	sh
 GH_TUPLE=	go-errgo:errgo:v2.1.0:go_errgo_errgo/vendor/gopkg.in/errgo.v2 \
 		golang:sys:9197077df867:golang_sys/vendor/golang.org/x/sys \
 		golang:term:ad39bd3f0407:golang_term/vendor/golang.org/x/term \
 		google:renameio:v0.1.0:google_renameio/vendor/github.com/google/renameio \
 		mvdan:editorconfig:e40951bde157:mvdan_editorconfig/vendor/mvdan.cc/editorconfig \
 		pkg:diff:531926345625:pkg_diff/vendor/github.com/pkg/diff \
 		rogpeppe:go-internal:v1.5.2:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal
 GO_TARGET=	./cmd/shfmt
 GO_BUILDFLAGS=	-ldflags="-s -w -X main.version=${DISTVERSIONFULL}"
 GO_TESTTARGET=	./cmd/shfmt
 PLIST_FILES=	bin/shfmt
 
 .include <bsd.port.mk>
diff --git a/security/testssl.sh/Makefile b/security/testssl.sh/Makefile
index 78ee8cbb8405..884e69fc13dc 100644
--- a/security/testssl.sh/Makefile
+++ b/security/testssl.sh/Makefile
@@ -1,49 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	testssl.sh
 DISTVERSION=	3.0.2
 CATEGORIES=	security
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Test TLS/SSL encryption anywhere on any port
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/openssl-unsafe/bin/openssl:security/openssl-unsafe \
 		bash:shells/bash
 TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON
 
 USES=		perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	drwetter
 USE_PERL5=	test
 SHEBANG_FILES=	testssl.sh utils/*
 TEST_ENV=	TESTSSL_INSTALL_DIR=${WRKSRC}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e '/elif test_openssl_suffix/d' \
 		-e 's@OPENSSL=PREFIX@OPENSSL=${PREFIX}@' \
 		-e 's@$${TESTSSL_INSTALL_DIR:-""}@$${TESTSSL_INSTALL_DIR:-"${DATADIR}"}@' \
 		-e '/check_bsd_mount$$/d' \
 		${WRKSRC}/testssl.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/testssl.sh \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/testssl.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 	@cd ${WRKSRC} && \
 		${COPYTREE_SHARE} "etc utils" ${STAGEDIR}${DATADIR}
 
 do-test:
 # Run the badssl.com test as a sanity check.  The full test suite
 # opens too many network connections and might take too long to
 # run.
 	@cd ${WRKSRC} && \
 		${SETENV} ${TEST_ENV} prove -v t/51_badssl.com.t
 
 .include <bsd.port.mk>