Index: devel/rubygem-apipie-bindings/Makefile
===================================================================
--- devel/rubygem-apipie-bindings/Makefile
+++ devel/rubygem-apipie-bindings/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	Ruby bindings for API calls that are documented with Apipie
 
 LICENSE=	MIT
Index: devel/rubygem-clamp/Makefile
===================================================================
--- devel/rubygem-clamp/Makefile
+++ devel/rubygem-clamp/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	devel ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	Command-line utility framework for Ruby
 
 LICENSE=	MIT
Index: devel/rubygem-fast_gettext/Makefile
===================================================================
--- devel/rubygem-fast_gettext/Makefile
+++ devel/rubygem-fast_gettext/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Fast, memory-efficient and threadsafe GetText for Ruby
 
 LICENSE=	MIT
Index: devel/rubygem-grape-entity/Makefile
===================================================================
--- devel/rubygem-grape-entity/Makefile
+++ devel/rubygem-grape-entity/Makefile
@@ -5,7 +5,7 @@
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Entities - a simple Facade to use with your models and API
 
 LICENSE=	MIT
Index: devel/rubygem-kafo/Makefile
===================================================================
--- devel/rubygem-kafo/Makefile
+++ devel/rubygem-kafo/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	devel ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	Ruby framework to create installers
 
 LICENSE=	GPLv3
Index: devel/rubygem-kafo_parsers/Makefile
===================================================================
--- devel/rubygem-kafo_parsers/Makefile
+++ devel/rubygem-kafo_parsers/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	devel ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	Parser for puppet modules
 
 LICENSE=	GPLv3
Index: devel/rubygem-table_print/Makefile
===================================================================
--- devel/rubygem-table_print/Makefile
+++ devel/rubygem-table_print/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	devel ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Turn objects into formatted columns
 
 LICENSE=	MIT
Index: sysutils/rubygem-chef-api/Makefile
===================================================================
--- sysutils/rubygem-chef-api/Makefile
+++ sysutils/rubygem-chef-api/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	Leightweight Chef API client
 
 LICENSE=	APACHE20
Index: sysutils/rubygem-hammer_cli/Makefile
===================================================================
--- sysutils/rubygem-hammer_cli/Makefile
+++ sysutils/rubygem-hammer_cli/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	Provides CLI interfaces for Ruby apps
 
 LICENSE=	GPLv3
Index: sysutils/rubygem-hammer_cli_foreman/Makefile
===================================================================
--- sysutils/rubygem-hammer_cli_foreman/Makefile
+++ sysutils/rubygem-hammer_cli_foreman/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	Foreman commands for Hammer CLI
 
 LICENSE=	GPLv3
Index: sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
===================================================================
--- sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
+++ sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	Foreman bootdisk commands for Hammer CLI
 
 LICENSE=	GPLv3
Index: sysutils/rubygem-hammer_cli_foreman_salt/Makefile
===================================================================
--- sysutils/rubygem-hammer_cli_foreman_salt/Makefile
+++ sysutils/rubygem-hammer_cli_foreman_salt/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	SaltStack integration commands for Hammer CLI
 
 LICENSE=	GPLv3
Index: sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
===================================================================
--- sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
+++ sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	SSH host commands for Hammer CLI
 
 LICENSE=	GPLv3
Index: sysutils/rubygem-logify/Makefile
===================================================================
--- sysutils/rubygem-logify/Makefile
+++ sysutils/rubygem-logify/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	Lightweight logging library for Ruby
 
 LICENSE=	APACHE20
Index: sysutils/rubygem-smart_proxy_salt/Makefile
===================================================================
--- sysutils/rubygem-smart_proxy_salt/Makefile
+++ sysutils/rubygem-smart_proxy_salt/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	SaltStack Plug-In for Foreman's Smart Proxy
 
 LICENSE=	GPLv3
Index: www/rubygem-tumblr_client/Makefile
===================================================================
--- www/rubygem-tumblr_client/Makefile
+++ www/rubygem-tumblr_client/Makefile
@@ -6,7 +6,7 @@
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kvedulv@kvedulv.de
+MAINTAINER=	mmoll@FreeBSD.org
 COMMENT=	Ruby Wrapper for the Tumblr v2 API
 
 LICENSE=	APACHE20