diff --git a/devel/cligen/Makefile b/devel/cligen/Makefile
index c406d9220944..9337c368d83d 100644
--- a/devel/cligen/Makefile
+++ b/devel/cligen/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	cligen
 PORTVERSION=	5.8.0
 CATEGORIES=	devel
 
-MAINTAINER=	dcornejo@netgate.com
+MAINTAINER=	dave@dogwood.com
 COMMENT=	Command-line interface generator
 WWW=		https://cligen.se/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 USES=		bison:alias compiler:c11 gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	clicon
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
 PLIST_SUB=	LIBMAJORVERSION=${PORTVERSION:R:R} \
 		LIBVERSION=${PORTVERSION:R}
 
 .include <bsd.port.mk>
diff --git a/devel/clixon/Makefile b/devel/clixon/Makefile
index 4f36b5a6e7c5..16eb4110a21a 100644
--- a/devel/clixon/Makefile
+++ b/devel/clixon/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	clixon
 PORTVERSION=	5.8.0
 CATEGORIES=	devel
 
-MAINTAINER=	dcornejo@netgate.com
+MAINTAINER=	dave@dogwood.com
 COMMENT=	YANG-based toolchain including CLI, NETCONF and RESTCONF interfaces
 WWW=		https://www.clicon.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 #LIB_DEPENDS=	libfcgi.so:www/fcgi
 BUILD_DEPENDS=	cligen>=5.6.0:devel/cligen \
 		nghttp2>=0:www/nghttp2
 RUN_DEPENDS=	cligen>=5.6.0:devel/cligen \
 		nghttp2>=0:www/nghttp2
 
 USES=		bison compiler:c11 gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	clicon
 
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${ETCDIR} \
 		--with-cligen=${LOCALBASE}
 CONFIGURE_ENV=	YACC="bison -y"
 MAKE_ARGS=	wwwdir=${PREFIX}/sbin \
 		wwwuser=${WWWOWN}
 
 SUB_FILES=	pkg-message
 
 USERS=		clixon
 GROUPS=		clixon
 
 PLIST_SUB=	LIBMAJORVERSION=${PORTVERSION:R:R} \
 		LIBVERSION=${PORTVERSION:R}
 
 OPTIONS_DEFAULT=		NATIVE
 OPTIONS_SINGLE=			RESTCONF
 OPTIONS_SINGLE_RESTCONF=	NATIVE FCGI OFF
 OPTIONS_SUB=	yes
 
 FCGI_DESC=	FCGI interface for stand-alone web rev-proxy (eg nginx)
 NATIVE_DESC=	Use embedded web server
 OFF_DESC=	Disable restconf
 
 FCGI_LIB_DEPENDS=	libfcgi.so:www/fcgi
 FCGI_CONFIGURE_ON=	--with-restconf=fcgi
 NATIVE_BUILD_DEPENDS=	nghttp2>=0:www/nghttp2
 NATIVE_RUN_DEPENDS=	nghttp2>=0:www/nghttp2
 NATIVE_CONFIGURE_ON=	--with-restconf=native
 OFF_CONFIGURE_ON=	--without-restconf
 
 .include <bsd.port.mk>