Index: graphics/nvidia-drm-kmod/Makefile
===================================================================
--- graphics/nvidia-drm-kmod/Makefile
+++ graphics/nvidia-drm-kmod/Makefile
@@ -2,7 +2,7 @@
 PORTVERSION=	${NVIDIA_DISTVERSION}
 CATEGORIES=	graphics kld
 
-MAINTAINER=	ashafer@badland.io
+MAINTAINER=	x11@FreeBSD.org
 COMMENT=	NVIDIA DRM Kernel Module
 WWW=		https://www.nvidia.com/object/unix.html
 
Index: x11/nvidia-driver/Makefile
===================================================================
--- x11/nvidia-driver/Makefile
+++ x11/nvidia-driver/Makefile
@@ -20,7 +20,7 @@
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER?=	danfe@FreeBSD.org
+MAINTAINER?=	x11@FreeBSD.org
 COMMENT?=	NVidia graphics card binary drivers for hardware OpenGL rendering
 WWW=		https://www.nvidia.com/object/unix.html
 
Index: x11/nvidia-secondary-driver/Makefile
===================================================================
--- x11/nvidia-secondary-driver/Makefile
+++ x11/nvidia-secondary-driver/Makefile
@@ -4,7 +4,7 @@
 
 MASTERDIR?=	${.CURDIR}/../nvidia-driver
 
-MAINTAINER=	theron.tarigo@gmail.com
+MAINTAINER=	x11@FreeBSD.org
 COMMENT=	NVidia graphics card binary drivers for hardware OpenGL rendering on secondary device
 
 CONFLICTS_INSTALL=	nvidia-driver