diff --git a/sysutils/avfs/Makefile b/sysutils/avfs/Makefile
index e0055f3137e8..8ba8e2f619c4 100644
--- a/sysutils/avfs/Makefile
+++ b/sysutils/avfs/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	avfs
 PORTVERSION=	1.1.4
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/avf/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	mp39590@gmail.com
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Virtual File System library
 WWW=		https://avf.sourceforge.net/
 
 # FUSE daemon is licensed as GPLv2, shared library is LGPLv2
 LICENSE=	LGPL20 GPLv2
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		libtool pkgconfig tar:bz2 shebangfix perl5
 USE_PERL5=	run
 SHEBANG_FILES=	extfs/uimg scripts/umountavfs scripts/mountavfs
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL="${PERL}"
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DAV DEBUG FUSE ZSTD
 OPTIONS_SUB=	yes
 
 DAV_DESC=	Build the DAV module (requires libneon)
 DAV_LIB_DEPENDS=	libneon.so:www/neon
 DAV_CONFIGURE_ENABLE=	dav
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
 FUSE_CONFIGURE_ENABLE=	fuse
 FUSE_USES=	fuse
 
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_CONFIGURE_WITH=	zstd
 
 post-patch:
 	@${REINPLACE_CMD} -e '/#include/s,neon/,,' ${WRKSRC}/modules/dav*.?
 
 .include <bsd.port.mk>
diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile
index 654d7ec744cd..eb3ed5bbbe77 100644
--- a/x11-fm/worker/Makefile
+++ b/x11-fm/worker/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	worker
 PORTVERSION=	5.1.0
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.boomerangsworld.de/cms/worker/downloads/
 
-MAINTAINER=	mp39590@gmail.com
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	X11 file manager based on Directory Opus of AmigaOS
 WWW=		http://www.boomerangsworld.de/cms/worker/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++14-lang localbase pkgconfig python:run \
 		shebangfix tar:bzip2 xorg
 GNU_CONFIGURE=	yes
 USE_XORG=	ice sm x11 xinerama
 
 SHEBANG_FILES=	${WRKSRC}/scripts/*.sh \
 		${WRKSRC}/scripts/xeditor \
 		${WRKSRC}/scripts/find_file_by_chksum.py
 
 OPTIONS_DEFINE=	AVFS DBUS INOTIFY LUA SSL XFT
 OPTIONS_DEFAULT=	AVFS DBUS INOTIFY SSL XFT
 OPTIONS_EXCLUDE_DragonFly=	AVFS
 
 INOTIFY_DESC=	Monitor directory changes via libinotify
 AVFS_DESC=	Use AVFS library to access archives
 SSL_DESC=	SHA-256 checksum support via OpenSSL
 
 AVFS_LIB_DEPENDS=	libavfs.so:sysutils/avfs
 AVFS_CONFIGURE_OFF=	--without-avfs
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_OFF=	--without-dbus
 
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 INOTIFY_CONFIGURE_OFF=	--disable-inotify
 
 LUA_USES=		lua
 LUA_CONFIGURE_OFF=	--disable-lua
 
 SSL_USES=		ssl
 SSL_CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
 
 XFT_USE=		xorg=xft
 XFT_CONFIGURE_OFF=	--disable-xft
 
 .include <bsd.port.mk>