Index: devel/gpds/Makefile
===================================================================
--- devel/gpds/Makefile
+++ devel/gpds/Makefile
@@ -2,7 +2,7 @@
 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/
 
Index: devel/malloy/Makefile
===================================================================
--- devel/malloy/Makefile
+++ devel/malloy/Makefile
@@ -2,7 +2,7 @@
 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
 
Index: devel/qschematic/Makefile
===================================================================
--- devel/qschematic/Makefile
+++ devel/qschematic/Makefile
@@ -2,7 +2,7 @@
 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
 
Index: devel/stdman/Makefile
===================================================================
--- devel/stdman/Makefile
+++ devel/stdman/Makefile
@@ -2,7 +2,7 @@
 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
 
Index: sysutils/cpufetch/Makefile
===================================================================
--- sysutils/cpufetch/Makefile
+++ sysutils/cpufetch/Makefile
@@ -3,7 +3,7 @@
 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
 
Index: x11-wm/bspwm-devel/Makefile
===================================================================
--- x11-wm/bspwm-devel/Makefile
+++ x11-wm/bspwm-devel/Makefile
@@ -3,7 +3,7 @@
 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
 
Index: x11/polybar/Makefile
===================================================================
--- x11/polybar/Makefile
+++ x11/polybar/Makefile
@@ -4,7 +4,7 @@
 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