diff --git a/devel/gpds/Makefile b/devel/gpds/Makefile
index d2b3afd612a9f..92d4e538e2c56 100644
--- a/devel/gpds/Makefile
+++ b/devel/gpds/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	gpds
 DISTVERSION=	1.6.0
 CATEGORIES=	devel
 
-MAINTAINER=	jbo@insane.engineer
+MAINTAINER=	jbo@FreeBSD.org
 COMMENT=	General purpose data serializer library written in modern C++
 WWW=		https://gpds.simulton.com/
 
diff --git a/devel/malloy/Makefile b/devel/malloy/Makefile
index b4e02959aa462..649c20c401857 100644
--- a/devel/malloy/Makefile
+++ b/devel/malloy/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	malloy
 DISTVERSION=	0.6.2
 CATEGORIES=	devel
 
-MAINTAINER=	jbo@insane.engineer
+MAINTAINER=	jbo@FreeBSD.org
 COMMENT=	Embeddable HTTP(S) and WS(S) client/server components for C++
 WWW=		https://github.com/tectu/malloy
 
diff --git a/devel/qschematic/Makefile b/devel/qschematic/Makefile
index dfe563357dcfa..14687062e3d25 100644
--- a/devel/qschematic/Makefile
+++ b/devel/qschematic/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	qschematic
 DISTVERSION=	1.4.0
 CATEGORIES=	devel
 
-MAINTAINER=	jbo@insane.engineer
+MAINTAINER=	jbo@FreeBSD.org
 COMMENT=	Qt/C++ library providing widgets for drawing diagrams
 WWW=		https://github.com/simulton/qschematic
 
diff --git a/devel/stdman/Makefile b/devel/stdman/Makefile
index 34a8662d4de14..1dbbedecd92a7 100644
--- a/devel/stdman/Makefile
+++ b/devel/stdman/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	stdman
 DISTVERSION=	2022.07.30
 CATEGORIES=	devel docs
 
-MAINTAINER=	jbo@insane.engineer
+MAINTAINER=	jbo@FreeBSD.org
 COMMENT=	Formatted C++20 stdlib man pages
 WWW=		https://github.com/jeaye/stdman
 
diff --git a/sysutils/cpufetch/Makefile b/sysutils/cpufetch/Makefile
index 995f507731c78..a16b956491d95 100644
--- a/sysutils/cpufetch/Makefile
+++ b/sysutils/cpufetch/Makefile
@@ -3,7 +3,7 @@ DISTVERSIONPREFIX=	v
 DISTVERSION=	1.04
 CATEGORIES=	sysutils
 
-MAINTAINER=	jbo@insane.engineer
+MAINTAINER=	jbo@FreeBSD.org
 COMMENT=	Simple yet fancy CPU architecture fetching tool
 WWW=		https://github.com/Dr-Noob/cpufetch
 
diff --git a/x11-wm/bspwm-devel/Makefile b/x11-wm/bspwm-devel/Makefile
index 972c8e6ee88e9..8a6c85f47b7f8 100644
--- a/x11-wm/bspwm-devel/Makefile
+++ b/x11-wm/bspwm-devel/Makefile
@@ -3,7 +3,7 @@ DISTVERSION=	0.9.10.20230829
 CATEGORIES=		x11-wm
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	jbo@insane.engineer
+MAINTAINER=	jbo@FreeBSD.org
 COMMENT=	Tiling window manager based on binary space partitioning
 WWW=		https://github.com/baskerville/bspwm
 
diff --git a/x11/polybar/Makefile b/x11/polybar/Makefile
index af919cb02ae71..499f4b60d957e 100644
--- a/x11/polybar/Makefile
+++ b/x11/polybar/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	https://github.com/polybar/polybar/releases/download/${DISTVERSION}/
 
-MAINTAINER=	jbo@insane.engineer
+MAINTAINER=	jbo@FreeBSD.org
 COMMENT=	Fast and easy-to-use status bar
 WWW=		https://github.com/polybar/polybar