diff --git a/databases/rubygem-dbm/Makefile b/databases/rubygem-dbm/Makefile
index d4ec5c090f8a..9a3be79f82e2 100644
--- a/databases/rubygem-dbm/Makefile
+++ b/databases/rubygem-dbm/Makefile
@@ -3,7 +3,7 @@ PORTVERSION=	1.1.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	yasu@FreeBSD.org
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Wrapper for the UNIX-style Database Manager Library
 WWW=		https://github.com/ruby/dbm
 
diff --git a/devel/rubygem-debug/Makefile b/devel/rubygem-debug/Makefile
index 9b13b70daae9..553839da32eb 100644
--- a/devel/rubygem-debug/Makefile
+++ b/devel/rubygem-debug/Makefile
@@ -3,7 +3,7 @@ DISTVERSION=	1.9.2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	yasu@FreeBSD.org
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Debugging functionality for Ruby
 WWW=		https://rubygems.org/gems/debug
 
diff --git a/devel/rubygem-io-console/Makefile b/devel/rubygem-io-console/Makefile
index bb507c5e518e..3399d89075f8 100644
--- a/devel/rubygem-io-console/Makefile
+++ b/devel/rubygem-io-console/Makefile
@@ -3,7 +3,7 @@ DISTVERSION=	0.7.2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	yasu@FreeBSD.org
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Add console capabilities to IO instances
 WWW=		https://github.com/ruby/io-console
 
diff --git a/devel/rubygem-reline/Makefile b/devel/rubygem-reline/Makefile
index cc7c3cd62d81..64b648db8867 100644
--- a/devel/rubygem-reline/Makefile
+++ b/devel/rubygem-reline/Makefile
@@ -3,7 +3,7 @@ DISTVERSION=	0.5.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	yasu@FreeBSD.org
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Alternative GNU Readline or Editline implementation by pure Ruby
 WWW=		https://rubygems.org/gems/reline
 
diff --git a/www/rubygem-rackup/Makefile b/www/rubygem-rackup/Makefile
index c42da6598deb..4fa141e992ae 100644
--- a/www/rubygem-rackup/Makefile
+++ b/www/rubygem-rackup/Makefile
@@ -3,7 +3,7 @@ DISTVERSION=	2.1.0
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	yasu@FreeBSD.org
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	General server command for Rack applications
 WWW=		https://github.com/rack/rackup