diff --git a/devel/bazel/Makefile b/devel/bazel/Makefile
index 58f55b5f1dbd9..29f1b671891f4 100644
--- a/devel/bazel/Makefile
+++ b/devel/bazel/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel java
 MASTER_SITES=	https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
 DISTNAME=	bazel-${PORTVERSION}rc${FINALRC}-dist
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast and correct build system
 WWW=		https://bazel.build/
 
diff --git a/devel/cvsadmin/Makefile b/devel/cvsadmin/Makefile
index 00c37a16a39d6..a3e92c3a577ce 100644
--- a/devel/cvsadmin/Makefile
+++ b/devel/cvsadmin/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/gabor
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple program to administrate users of a CVS repository
 
 GNU_CONFIGURE=	yes
diff --git a/devel/py-wsgitools/Makefile b/devel/py-wsgitools/Makefile
index b31c59df55418..c4e4bec30bc6c 100644
--- a/devel/py-wsgitools/Makefile
+++ b/devel/py-wsgitools/Makefile
@@ -6,7 +6,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Useful middlewares and filters for wsgi as well as scgi servers
 WWW=		https://subdivi.de/~helmut/wsgitools/
 
diff --git a/lang/haskell-mode.el/Makefile b/lang/haskell-mode.el/Makefile
index 5b6e83eed2af0..a657c991aed3d 100644
--- a/lang/haskell-mode.el/Makefile
+++ b/lang/haskell-mode.el/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	4
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs lisp mode for editing haskell programs
 WWW=		https://projects.haskell.org/haskellmode-emacs/
 
diff --git a/science/h5utils/Makefile b/science/h5utils/Makefile
index 77f39ae930d8c..a32d97be6151d 100644
--- a/science/h5utils/Makefile
+++ b/science/h5utils/Makefile
@@ -3,7 +3,7 @@ DISTVERSION=	1.13.1
 PORTREVISION=	6
 CATEGORIES=	science
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of utilities for visualization and conversion of HDF5 format
 WWW=		https://github.com/stevengj/h5utils
 
diff --git a/x11-clocks/tclock/Makefile b/x11-clocks/tclock/Makefile
index 0a7185f93ce5a..4ef05259ddc9e 100644
--- a/x11-clocks/tclock/Makefile
+++ b/x11-clocks/tclock/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.linta.de/distfiles/ \
 		ftp://ftp.uni-potsdam.de/pub/X11/tools/clocks/
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Transparent analog clock for x11
 
 LICENSE=	GPLv1