diff --git a/net/urlendec/Makefile b/net/urlendec/Makefile
index 2a8182ff6339..118c7cf06ddd 100644
--- a/net/urlendec/Makefile
+++ b/net/urlendec/Makefile
@@ -1,37 +1,37 @@
 # Created by: G. Adam Stanislav <adam@whizkidtech.net>
 
 PORTNAME=	urlendec
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.whizkidtech.redprince.net/fports/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	URL encoder and decoder written in assembly
 
 LICENSE=	BSD2CLAUSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	written in x86 assembly language
 
 BUILD_DEPENDS=	nasm:devel/nasm
 
 PLIST_FILES=	bin/urlencode bin/urldecode
 PORTDOCS=	index.html rfc1738.txt
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^[[:blank:]]*ld/s,-o,-m elf_i386_fbsd &, \
 		; /^[[:blank:]]*nasm/s,elf,&32,' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/^section/s,code,text,' ${WRKSRC}/*.asm
 
 do-install:
 	${INSTALL_PROGRAM} ${PLIST_FILES:[1..2]:T:S,^,${WRKSRC}/,} \
 		${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/gomi/Makefile b/sysutils/gomi/Makefile
index 82c7fd095f5c..96d948688b78 100644
--- a/sysutils/gomi/Makefile
+++ b/sysutils/gomi/Makefile
@@ -1,43 +1,42 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	gomi
 PORTVERSION=	1.1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
-MAINTAINER=	danfe@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unix rm(1) command that can restore deleted files
 
 LICENSE=	MIT
 
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	b4b4r07
-
 GH_TUPLE=	\
 		b4b4r07:go-cli-log:8fac4d71de01:b4b4r07_go_cli_log/vendor/github.com/b4b4r07/go-cli-log \
 		chzyer:readline:2972be24d48e:chzyer_readline/vendor/github.com/chzyer/readline \
 		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		gabriel-vasile:mimetype:v1.0.2:gabriel_vasile_mimetype/vendor/github.com/gabriel-vasile/mimetype \
 		golang:crypto:530e935923ad:golang_crypto/vendor/golang.org/x/crypto \
 		golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:fc99dfbffb4e:golang_sys/vendor/golang.org/x/sys \
 		hashicorp:logutils:v1.0.0:hashicorp_logutils/vendor/github.com/hashicorp/logutils \
 		jessevdk:go-flags:v1.4.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \
 		juju:ansiterm:720a0952cc2a:juju_ansiterm/vendor/github.com/juju/ansiterm \
 		lunixbochs:vtclean:2d01aacdc34a:lunixbochs_vtclean/vendor/github.com/lunixbochs/vtclean \
 		manifoldco:promptui:v0.7.0:manifoldco_promptui/vendor/github.com/manifoldco/promptui \
 		mattn:go-colorable:v0.1.4:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.8:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		rs:xid:v1.2.1:rs_xid/vendor/github.com/rs/xid
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README.md
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>