diff --git a/cad/librnd/Makefile b/cad/librnd/Makefile
index a776e063d409..211b4f4879c2 100644
--- a/cad/librnd/Makefile
+++ b/cad/librnd/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	librnd
 DISTVERSION=	3.2.2
 PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://repo.hu/projects/${PORTNAME}/releases/
 
-MAINTAINER=	fuz@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flexible, modular two-dimensional CAD engine
 WWW=		http://www.repo.hu/projects/librnd/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfungw.so:devel/fungw \
 		libgenht.so:devel/genht
 
 USES=		gmake pkgconfig tar:bz2
 USE_LDCONFIG=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--all=plugin --plugin-hid_remote \
 		${WITH_DEBUG:D--debug} \
 		--CC=${CC} \
 		--CFLAGS='${CFLAGS}' \
 		--LDFLAGS='${LDFLAGS}'
 
 TEST_TARGET=	test
 BINARY_ALIAS=	make=${MAKE_CMD}
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=	DOCS GD MOTIF GTK2 GTK2GL GTK4 STROKE WGET
 OPTIONS_DEFAULT=	GD GTK2 GTK2GL STROKE WGET
 OPTIONS_SUB=	yes
 GTK2GL_DESC=	GTK+ 2 GUI with OpenGL support
 GTK4_DESC=	GTK+ 4 GUI toolkit support
 WGET_DESC=	Wget support
 
 GD_LIB_DEPENDS=	libgd.so:graphics/gd
 GD_CONFIGURE_OFF=	--disable-gd
 
 GTK2GL_IMPLIES=	GTK2
 GTK2GL_LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 GTK2GL_USES=	gl
 GTK2GL_USE=	gl=gl,glu gnome=pangox-compat xorg=x11
 GTK2GL_CONFIGURE_OFF=	--disable-hid_gtk2_gl
 
 GTK2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz
 GTK2_USES=	gnome
 GTK2_USE=	gnome=cairo,gdkpixbuf2,gtk20
 GTK2_CONFIGURE_OFF=	--disable-hid_gtk2_gdk
 
 GTK4_IMPLIES=	GTK2
 GTK4_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 			libgraphene-1.0.so:graphics/graphene \
 			libharfbuzz.so:print/harfbuzz \
 			libvulkan.so:graphics/vulkan-loader
 GTK4_USES=	gl gnome
 GTK4_USE=	gl=gl,glu gnome=cairo,gdkpixbuf2,gtk40
 GTK4_CONFIGURE_OFF=	--disable-hid_gtk4_gl
 
 MOTIF_USES=	motif
 MOTIF_USE=	xorg=xt,x11,xinerama,xrender
 MOTIF_CONFIGURE_OFF=	--disable-hid_lesstif
 
 STROKE_LIB_DEPENDS=	libstroke.so:devel/libstroke
 STROKE_CONFIGURE_OFF=	--disable-stroke
 
 WGET_RUN_DEPENDS=	wget:ftp/wget
 WGET_CONFIGURE_OFF=	--disable-lib_wget
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK4} || ${PORT_OPTIONS:MMOTIF}
 PLIST_SUB+=	GUI=""
 .else
 PLIST_SUB+=	GUI="@comment "
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} \
 	    -e 's,%%LOCALBASE%%,${LOCALBASE},' \
 	    -e 's,%%MOTIFLIB%%,${MOTIFLIB},' \
 	    ${WRKSRC}/scconfig/src/gui/find_gl.c \
 	    ${WRKSRC}/scconfig/src/gui/find_lesstif2.c \
 	    ${WRKSRC}/scconfig/src/gui/find_misc.c \
 	    ${WRKSRC}/scconfig/src/gui/find_x.c
 
 .include <bsd.port.post.mk>
diff --git a/cad/pcb-rnd/Makefile b/cad/pcb-rnd/Makefile
index 7681c3ac187b..0216c9a69ca6 100644
--- a/cad/pcb-rnd/Makefile
+++ b/cad/pcb-rnd/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	pcb-rnd
 DISTVERSION=	3.0.6
 CATEGORIES=	cad
 MASTER_SITES=	http://repo.hu/projects/pcb-rnd/releases/
 
-MAINTAINER=	fuz@FreeBSD.org
+MAINTAINER=	port@FreeBSD.org
 COMMENT=	Flexible, modular Printed Circuit Board editor
 WWW=		http://www.repo.hu/projects/pcb-rnd/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfungw.so:devel/fungw \
 		libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libgenht.so:devel/genht \
 		librnd-hid.so:cad/librnd \
 		libxml2.so:textproc/libxml2
 
 USES=		gmake pkgconfig tar:bz2
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cflags/libs/sul/freetype2="-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include/freetype2/freetype" \
 		--ldflags/libs/sul/freetype2=-L${LOCALBASE}/lib \
 		${WITH_DEBUG:D--debug} \
 		--CC=${CC} \
 		--CFLAGS='${CFLAGS}' \
 		--LDFLAGS='${LDFLAGS}'
 BINARY_ALIAS=	make=${MAKE_CMD}
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 .for f in pcb-rnd txt2bxl bxl2txt gsch2pcb-rnd
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$f
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pcb-rnd/plugins/*.so
 
 .include <bsd.port.mk>